Skip to content

Revert #151380 and #153869#154308

Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
ShoyuVanilla:undo-fudge-iv
Apr 2, 2026
Merged

Revert #151380 and #153869#154308
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
ShoyuVanilla:undo-fudge-iv

Conversation

@ShoyuVanilla
Copy link
Copy Markdown
Member

@ShoyuVanilla ShoyuVanilla commented Mar 24, 2026

@rustbot rustbot added 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. labels Mar 24, 2026
@rustbot

This comment has been minimized.

Sign in to view
@ShoyuVanilla
Revert "Auto merge of rust-lang#151380 - ShoyuVanilla:shallow-resolve…
d5bbeb9 
…-to-root-var, r=lcnr"

This reverts commit 75b9d89, reversing
changes made to 7bee525.
@ShoyuVanilla
Revert "Auto merge of rust-lang#153869 - ShoyuVanilla:issue-153816, r…
1a67312 
…=lcnr"

This reverts commit 1f7f8ea, reversing
changes made to 8b86f48.
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 24, 2026

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 24, 2026

⚠️ Warning ⚠️

  • There are issue links (such as #123) in the commit messages of the following commits.
    Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.

@ShoyuVanilla ShoyuVanilla changed the title Revert #153869 Revert #151380 and #153869 Mar 24, 2026
@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented Apr 1, 2026

Thanks. r+-ing as discussed in #t-compiler/backports > #153869: beta-nominated @ 💬 since both are clean reverts.

@bors r+ rollup=never

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 1, 2026

📌 Commit 1a67312 has been approved by jieyouxu

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Apr 1, 2026
@jieyouxu jieyouxu self-assigned this Apr 1, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 2, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 2, 2026

☀️ Test successful - CI
Approved by: jieyouxu
Duration: 3h 8m 4s
Pushing 009a6c1 to main...

@rust-bors rust-bors bot merged commit 009a6c1 into rust-lang:main Apr 2, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Apr 2, 2026
@ShoyuVanilla ShoyuVanilla deleted the undo-fudge-iv branch April 2, 2026 03:19
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 2, 2026

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 7e46c5f (parent) -> 009a6c1 (this PR)

Test differences

Show 31 test diffs

Stage 1

  • [codegen] tests/codegen-llvm/amdgpu-addrspacecast.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [codegen] tests/codegen-llvm/issues/issue-122600-ptr-discriminant-update.rs#old: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [codegen] tests/codegen-llvm/issues/issue-37945.rs#new: ignore (ignored when the LLVM version 22.1.0 is older than 23.0.0) -> ignore (ignored when the LLVM version 22.1.1 is older than 23.0.0) (J1)
  • [codegen] tests/codegen-llvm/issues/matches-logical-or-141497.rs: ignore (ignored when the LLVM version 22.1.0 is older than 23.0.0) -> ignore (ignored when the LLVM version 22.1.1 is older than 23.0.0) (J1)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-gather.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-masked-load.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-masked-store.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-scatter.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [codegen] tests/codegen-llvm/vec_pop_push_noop.rs#old: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [codegen] tests/codegen-llvm/vecdeque_pop_push.rs#old: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J1)
  • [ui] tests/ui/coercion/fudge-inference/input-ty-closure-param-fn-trait-bounds.rs: pass -> [missing] (J3)
  • [ui] tests/ui/coercion/fudge-inference/input-ty-higher-ranked-fn-trait.rs: pass -> [missing] (J3)

Stage 2

  • [codegen] tests/codegen-llvm/amdgpu-addrspacecast.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [codegen] tests/codegen-llvm/issues/issue-122600-ptr-discriminant-update.rs#old: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [codegen] tests/codegen-llvm/issues/issue-37945.rs#new: ignore (ignored when the LLVM version 22.1.0 is older than 23.0.0) -> ignore (ignored when the LLVM version 22.1.1 is older than 23.0.0) (J0)
  • [codegen] tests/codegen-llvm/issues/matches-logical-or-141497.rs: ignore (ignored when the LLVM version 22.1.0 is older than 23.0.0) -> ignore (ignored when the LLVM version 22.1.1 is older than 23.0.0) (J0)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-gather.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-masked-load.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-masked-store.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [codegen] tests/codegen-llvm/simd-intrinsic/simd-intrinsic-generic-scatter.rs#LLVM21: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [codegen] tests/codegen-llvm/vec_pop_push_noop.rs#old: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [codegen] tests/codegen-llvm/vecdeque_pop_push.rs#old: ignore (ignored when the LLVM version (22.1.0) is newer than majorversion 21) -> ignore (ignored when the LLVM version (22.1.1) is newer than majorversion 21) (J0)
  • [ui] tests/ui/coercion/fudge-inference/input-ty-closure-param-fn-trait-bounds.rs: pass -> [missing] (J2)
  • [ui] tests/ui/coercion/fudge-inference/input-ty-higher-ranked-fn-trait.rs: pass -> [missing] (J2)

Additionally, 7 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 009a6c1e8b559de780be565937d83e8f4a36d58d --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. pr-check-1: 28m 5s -> 37m 54s (+34.9%)
  2. dist-aarch64-linux: 2h 37m -> 1h 54m (-27.5%)
  3. dist-apple-various: 1h 50m -> 1h 25m (-22.7%)
  4. x86_64-gnu-tools: 52m 18s -> 1h 3m (+20.5%)
  5. x86_64-gnu-stable: 2h 3m -> 2h 27m (+18.9%)
  6. aarch64-apple: 3h 20m -> 2h 43m (-18.7%)
  7. x86_64-gnu-llvm-22-3: 1h 42m -> 2h (+18.1%)
  8. x86_64-rust-for-linux: 45m 39s -> 53m 11s (+16.5%)
  9. dist-aarch64-msvc: 1h 34m -> 1h 48m (+14.7%)
  10. i686-gnu-2: 1h 31m -> 1h 44m (+13.5%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Apr 2, 2026
Open
Open
Draft
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Apr 2, 2026

Finished benchmarking commit (009a6c1): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)		 0.3% [0.1%, 0.5%] 16
Regressions ❌
(secondary)		 3.6% [0.0%, 8.6%] 36
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.3% [-1.1%, -0.0%] 16
All ❌✅ (primary) 0.3% [0.1%, 0.5%] 16

Max RSS (memory usage)

Results (primary 3.7%, secondary 2.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 3.7% [3.7%, 3.7%] 1
Regressions ❌
(secondary)		 2.2% [1.3%, 2.8%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 3.7% [3.7%, 3.7%] 1

Cycles

Results (secondary 3.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 4.8% [2.0%, 8.1%] 25
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -4.1% [-5.2%, -2.9%] 4
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 490.376s -> 488.623s (-0.36%)
Artifact size: 394.91 MiB -> 395.24 MiB (0.08%)

@rustbot rustbot added the perf-regression Performance regression. label Apr 2, 2026
@Mark-Simulacrum Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Apr 6, 2026
@Mark-Simulacrum
Copy link
Copy Markdown
Member

Mark-Simulacrum commented Apr 6, 2026

This reverts two improvements, so regressions are expected. This is ultimately a correctness fix, so marking as triaged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jieyouxu jieyouxu

Labels

merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

5 participants

@ShoyuVanilla @rustbot @jieyouxu @rust-timer @Mark-Simulacrum