Rollup of 5 pull requests#156341
Conversation
Update compare modes
rust-lang/rust@80d2bdb6 changed `sess` to `psess` in 2024. `gated_spans` appears to have always been plural.
Fix tip on unstable syntax gating
This updates the rust-version file to 045b177.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@045b177 Filtered ref: rust-lang/rustc-dev-guide@2622ac3 Upstream diff: rust-lang/rust@f53b654...045b177 This merge was created using https://github.com/rust-lang/josh-sync.
…c-pull Rustc pull update
Add CI testing instructions for offload
Co-Authored-By: mu001999 <mu001999@outlook.com>
Remove outdated apple download instructions
This updates the rust-version file to f2b291d.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@f2b291d Filtered ref: rust-lang/rustc-dev-guide@f2fe946 Upstream diff: rust-lang/rust@045b177...f2b291d This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
sembr a few files
… r=lcnr Resolve some cases of rust-lang#132279 by using the right typing mode in the next solver r? @lcnr Convert 3 FIXMEs of rust-lang#132279 to using the right typing mode when we can (`tcx.use_typing_mode_borrowck()`) Also resolves rust-lang#155093, which I closed
fix incorrect suggestions in private import diagnostic Resolves rust-lang#156060. 1. In nested imports like `use two::{One, ...}`, the diagnostic suggested replacing the `One` with a multi-segment path of a different module, producing invalid code like `use crate::two::{one::One, Two}`. Skip it when `single_nested == true`. 2. Stop unconditionally skipping the first segment of `import.module_path`, which can produce incorrect paths in edition 2018 and later. 3. Mark the suggestion as "directly" instead of "through the re-export" when the import's source is the definition itself.
… r=TaKO8Ki Move tests consts Hi I have moved some tests from ui/issues into the fitting ui/consts folder Fixes a part of rust-lang#133895
…-unicode-span, r=Urgau Avoid invalid spans in dotdotdot rest pattern suggestions Fixes rust-lang#156316 The parser recovers Unicode confusables such as `···` as `...`, while keeping the original source span over the multibyte characters. `recover_dotdotdot_rest_pat` built its suggestion by subtracting `BytePos(1)` from the end of that recovered token span. For multibyte characters, that can create a span boundary inside a UTF-8, causing diagnostic emission to ICE. This changes the suggestion to replace the whole recovered token span with `..` instead of slicing off one byte.
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@34d6968. Created using https://github.com/rust-lang/josh-sync. r? @ghost
|
@bors r+ rollup=never p=5 |
This comment has been minimized.
This comment has been minimized.
|
📌 Perf builds for each rolled up PR:
previous master: 8068e2fc9a 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 8068e2f (parent) -> fb0a5a5 (this PR) Test differencesShow 96 test diffsStage 1
Stage 2
Additionally, 40 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 fb0a5a5a9c892b351f34263d6d84da9dde72871a --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 |
| } | ||
|
|
||
| if !opaque_type_storage.is_empty() { | ||
| ty::tls::with(|tcx| tcx.dcx().delayed_bug(format!("{opaque_type_storage:?}"))); |
There was a problem hiding this comment.
|
Finished benchmarking commit (fb0a5a5): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis perf run didn't have relevant results for this metric. Max RSS (memory usage)Results (secondary -2.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesThis perf run didn't have relevant results for this metric. Binary sizeThis perf run didn't have relevant results for this metric. Bootstrap: 498.048s -> 497.93s (-0.02%) |
Successful merges:
TypingModetransition #132279 by using the right typing mode in the next solver)r? @ghost
Create a similar rollup