Rollup of 10 pull requests #146938
Merged
Rollup of 10 pull requests #146938
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.)
Factor out the check for a variable that's still repeating.
Identify metavariable functions by using named symbols rather than string comparisons.
Co-authored-by: lolbinarycat <[email protected]>
To make the code easier to understand.
…henkov Fix uses of "adaptor" These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.) A second commit comes along for the ride to fix other instances in non-rustdoc comments.
…jdonszelmann test: Use SVG for terminal url test I came across the test for `-Zterminal-urls` and found its output a bit hard to read. So, I decided to switch it to an SVG test, as I found it easier to differentiate the link and link text. Note: `anstyle-svg` needed to be upgraded to at least `0.1.8` to support links in SVGs, so I went ahead and upgraded it to the latest version (`0.1.11`).
fixes for numerous clippy warnings
[win] Use find-msvc-tools instead of cc to find the linker and rc on Windows `find-msvc-tools` was factored out from `cc` to allow updating the use in `rustc_codegen_ssa` (finding the linker when running the Rust compiler) and `rustc_windows_rc` (finding the Windows Resource Compiler when running the Rust compiler) to be separate from the use in `rustc_llvm` (building LLVM as part of building the Rust compiler).
Fix a dangling reference in `rustc_thread_pool` This diverged from `rayon` in rust-lang#142384, where a cleanup commit turned the matched `worker_index` into a reference, which is read _after_ the `set` that may kill it. I've moved that read beforehand, and I hope the new comments will emphasize the subtlety of this unsafe code. Hopefully fixes rust-lang#146677.
…r=petrochenkov mbe: Simplifications and refactoring A few simplifications and refactors in advance of other work. Macro metavariable expressions were using `Ident::as_str` and doing string comparisons; I converted them to use symbols. I factored out a function for transcribing a `ParseNtResult`, which will help separate the evaluation and transcription of future macro metavariable expressions.
add private module override re-export test - Closes rust-lang#60926 Added a new test to check that `rustdoc` does not create links to `m2` in the crate root when `pub use m1::*` is overrided by `use crate::m1::m2`.
…nethercote Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly) This PR updates the list of good combinations of Rust toolchains and LLVM releases for linker-plugin-based LTO Related to first question in https://users.rust-lang.org/t/questions-regarding-linker-plugin-based-lto/134070
tests/run-make/crate-loading: Rename source files for clarity For rust-lang#146874 I originally tried to extend the existing test **tests/run-make/crate-loading**. That didn't work out since adding a re-export of the entire crate significantly changes the emitted error messsage. I did put some effort into making that test easier to understand however, by renaming its files. (Since I was confused myself at first.) Let's save some time for future devs by doing just the renames. Further cleanups are possible, but that will change the blessed output, so let's not do that right now. r? ```@jieyouxu``` since you have the context of rust-lang#146874
…arycat,GuillaumeGomez prevent line number from being copied in chrome - Closes rust-lang#146816 Fix the issue where line numbers are copied along with code in Chrome
rustbot
added
A-compiletest
rustbot
added
A-testsuite
|
@bors r+ rollup=never p=5 |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR:
previous master: 4056082360 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 4056082 (parent) -> 975e6c8 (this PR) Test differencesShow 10 test diffsStage 1
Stage 2
Additionally, 8 doctest diffs were found. These are ignored, as they are noisy. Job group index Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 975e6c8fec280816d24fbde6b8dfe19620f2efe6 --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
4 tasks
|
Finished benchmarking commit (975e6c8): comparison URL. Overall result: ✅ improvements - no action needed@rustbot label: -perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary 1.9%, secondary -4.6%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary 2.3%, secondary 2.5%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 472.868s -> 470.599s (-0.48%) |
Muscraft
pushed a commit
to Muscraft/rust
that referenced
this pull request
Sep 24, 2025
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#146632 (Fix uses of "adaptor") - rust-lang#146731 (test: Use SVG for terminal url test) - rust-lang#146775 (fixes for numerous clippy warnings) - rust-lang#146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows) - rust-lang#146799 (Fix a dangling reference in `rustc_thread_pool`) - rust-lang#146802 (mbe: Simplifications and refactoring) - rust-lang#146806 (add private module override re-export test) - rust-lang#146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly)) - rust-lang#146875 (tests/run-make/crate-loading: Rename source files for clarity) - rust-lang#146877 (prevent line number from being copied in chrome) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
rustc_thread_pool#146799 (Fix a dangling reference inrustc_thread_pool)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup