Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #137914

Merged
merged 21 commits into from
Mar 3, 2025
Merged

Rollup of 6 pull requests #137914

merged 21 commits into from
Mar 3, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 21 commits February 25, 2025 20:26
Fixes tests/ui/attributes/used_with_archive.rs fail
These tests can be `check-pass` and do not need dynamic libraries.
Also remove other unnecessary stuff from them.
- replace `OnceLock` with `LazyLock`
- use `let..else` where applicable
…ted-syntax, r=aDotInTheVoid

{json|html}docck: catch and error on deprecated syntax

rust-lang#137099 (review)
…r=workingjubilee

rustdoc: when merging target features, keep the highest stability

This addresses rust-lang#137366. (Not closing since we might consider a backport.)

rustdoc wants to pretend that it runs for all targets at once and has all target features, so `tcx.rust_target_features()` will actually be all the target features. For target features that exist on multiple targets, the stability info for one of the targets will be picked (first or last in the list, I guess). All the code consuming that query has to be aware that the data is basically nonsense when running in rustdoc, but the logic checking for unstable or forbidden `#[target_feature]` attributes was not aware of that.

This PR makes the  `tcx.rust_target_features()` info in rustdoc slightly less nonsensical (and decidedly less random) by having the "most stable" target feature take precedent. That deals with rust-lang#137366 (a conflict between a stable and a "forbidden" target feature of the same name for different targets), and also deals with the situation (that we did not seem to have yet) of a conflict between a stable and an unstable target feature of the same name. Note that if there are two unstable target features of the same name, rustdoc might still require the "wrong" nightly feature to be enabled -- but this can only possibly affect unstable code so I guess we can wait until that actually happens, and then someone will have to rewrite this entire thing to be less hacky.
…=notriddle

Add rustdoc support for `--emit=dep-info[=path]`

Fixes rust-lang#91982.

This PR adds the `--emit=dep-info` command line flag support. It will be helpful for `cargo` development.

cc ````@epage````

r? ````@notriddle````
…rors

tests: Unignore target modifier tests on all platforms

These tests can be `check-pass` and do not need dynamic libraries.
Also remove other unnecessary stuff from them.

Follow up to rust-lang#133138.
…133528, r=DianQK

test(codegen): add looping_over_ne_bytes test for rust-lang#133528

Adds test for rust-lang#133528.
I renamed the function to `looping_over_ne_bytes` to better reflect that it is doing.
I also set the min llvm version to 20 as this was presumably a llvm bug that was fixed in version 20.
I didn't tie the test to any specific architecture, as we are testing llvm output.
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Mar 3, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 3, 2025

📌 Commit 15e97bd has been approved by matthiaskrgr

It is now in the queue for this repository.

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
##[endgroup]
Image input checksum 10e5256c82e9dc991a85847eccc5af5b384e45deb24f20226ee990e79e2b1cce1a58ed4ec1b55787189fe5ea0c85781512db66fa757b9fe4518d1b5c99957e03
##[group]Building docker image for dist-x86_64-linux
Docker version 26.1.3, build b72abbb
Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang-ci&client_id=docker&offline_token=true&service=ghcr.io": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.

@matthiaskrgr
Copy link
Member Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 3, 2025
@bors
Copy link
Contributor

bors commented Mar 3, 2025

⌛ Testing commit 15e97bd with merge b5d3661...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2025
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#137103 ({json|html}docck: catch and error on deprecated syntax)
 - rust-lang#137632 (rustdoc: when merging target features, keep the highest stability)
 - rust-lang#137684 (Add rustdoc support for `--emit=dep-info[=path]`)
 - rust-lang#137794 (make qnx pass a test)
 - rust-lang#137801 (tests: Unignore target modifier tests on all platforms)
 - rust-lang#137826 (test(codegen): add looping_over_ne_bytes test for rust-lang#133528)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Mar 3, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 3, 2025
@matthiaskrgr
Copy link
Member Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 3, 2025
@bors
Copy link
Contributor

bors commented Mar 3, 2025

⌛ Testing commit 15e97bd with merge e0bfbba...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2025
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#137103 ({json|html}docck: catch and error on deprecated syntax)
 - rust-lang#137632 (rustdoc: when merging target features, keep the highest stability)
 - rust-lang#137684 (Add rustdoc support for `--emit=dep-info[=path]`)
 - rust-lang#137794 (make qnx pass a test)
 - rust-lang#137801 (tests: Unignore target modifier tests on all platforms)
 - rust-lang#137826 (test(codegen): add looping_over_ne_bytes test for rust-lang#133528)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-rust-for-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

This is usually done by running one of the following (note the leading DOT):
. "/cargo/env"            # For sh/bash/zsh/ash/dash/pdksh
source "/cargo/env.fish"  # For fish
source "/cargo/env.nu"    # For nushell
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint: 
---
error: toolchain options are ignored for a custom toolchain (local)
error: could not compile `proc-macro2` (build script)

Caused by:
  process didn't exit successfully: `rustc --crate-name build_script_build --edition=2021 /cargo/registry/src/index.crates.io-1949cf8c6b5b557f/proc-macro2-1.0.94/build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debug-assertions=off --cfg 'feature="default"' --cfg 'feature="proc-macro"' --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values("default", "nightly", "proc-macro", "span-locations"))' -C metadata=1d810ec263966d8c -C extra-filename=-7f676d262f19d6fd --out-dir /tmp/cargo-installwpnkeQ/release/build/proc-macro2-7f676d262f19d6fd -C strip=debuginfo -L dependency=/tmp/cargo-installwpnkeQ/release/deps --cap-lints allow` (exit status: 1)
warning: build failed, waiting for other jobs to finish...
error: failed to compile `bindgen-cli v0.65.1`, intermediate artifacts can be found at `/tmp/cargo-installwpnkeQ`.
To reuse those artifacts with a future compilation, set the environment variable `CARGO_TARGET_DIR` to that path.
  network time: Mon, 03 Mar 2025 13:15:29 GMT
##[error]Process completed with exit code 101.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Mar 3, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 3, 2025
@matthiaskrgr
Copy link
Member Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 3, 2025
@matthiaskrgr
Copy link
Member Author

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Mar 3, 2025

⌛ Testing commit 15e97bd with merge e16a049...

@bors
Copy link
Contributor

bors commented Mar 3, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing e16a049 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 3, 2025
@bors bors merged commit e16a049 into rust-lang:master Mar 3, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 3, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#137103 {json|html}docck: catch and error on deprecated syntax 7924cbefc6308f00568fb29c3f3c32176841ca15 (link)
#137632 rustdoc: when merging target features, keep the highest sta… 0f8edbe672b43ac6212c9b0ca16e9dbf626e37e5 (link)
#137684 Add rustdoc support for --emit=dep-info[=path] c985b40f119a5d623c1ebcddd7e099b845931dab (link)
#137794 make qnx pass a test 7bfcb212f34581cc9b5d2ca7e49becc24f116372 (link)
#137801 tests: Unignore target modifier tests on all platforms 9c53ef0d5863d6ba2ab6cfa577896b044903465c (link)
#137826 test(codegen): add looping_over_ne_bytes test for #133528 008c1c82b2c86bb674fd74fbfe11fd89888707f7 (link)

previous master: d491662340

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e16a049): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -1.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.5% [-1.5%, -1.5%] 1
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 773.665s -> 773.808s (0.02%)
Artifact size: 361.92 MiB -> 361.97 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.