Skip to content

Revert tearing changes to dbg!#156589

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
cuviper:revert-dbg-tearing
May 20, 2026
Merged

Revert tearing changes to dbg!#156589
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
cuviper:revert-dbg-tearing

Conversation

@cuviper
Copy link
Copy Markdown
Member

@cuviper cuviper commented May 15, 2026

Since the primary change to dbg! in #149869, we've been chasing a few regressions:

We already reverted this once, on beta only to prevent these regressions from shipping in 1.95.

In that most recent PR, we decided that it would be better to revert dbg! to its original state everywhere (main and 1.96-beta), and then we can consider it from scratch later. So here I've reverted the change and its fixes, but kept the regression tests, including the pending one.

cc @joboet @dianne @rust-lang/libs
@rustbot label beta-nominated

cuviper and others added 4 commits May 14, 2026 15:36
…-Simulacrum"

This reverts commit 59b36a5, reversing
changes made to 197eb8c.
…Mark-Simulacrum"

This reverts commit 2a18b88, reversing
changes made to cd14b73.
…mulacrum"

This reverts commit cc666ba, reversing
changes made to 2da5959.
These are all tests from trying to fix the tear-free `dbg!`:

* rust-lang#154074
* rust-lang#154994
* rust-lang#155915

These should also work as we revert to the old `dbg!`, so we should keep
the tests to make sure they don't regress again.

Co-authored-by: dianne <diannes.gm@gmail.com>
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 15, 2026

The Clippy subtree was changed

cc @rust-lang/clippy

The Miri subtree was changed

cc @rust-lang/miri

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. labels May 15, 2026
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 15, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 15, 2026

r? @mu001999

rustbot has assigned @mu001999.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 73 candidates
  • Random selection from 17 candidates

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 15, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 15, 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.

@cuviper
Copy link
Copy Markdown
Member Author

cuviper commented May 15, 2026

r? libs

@the8472
Copy link
Copy Markdown
Member

the8472 commented May 19, 2026

The principle of the thing was already approved by the team, the reverts look clean, 👍️ for retaining the tests.

@bors r+

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 19, 2026

📌 Commit 6f35b83 has been approved by the8472

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 May 19, 2026
@rust-bors

This comment has been minimized.

@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 May 20, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 20, 2026

☀️ Test successful - CI
Approved by: the8472
Duration: 3h 11m 37s
Pushing 4b97926 to main...

@rust-bors rust-bors Bot merged commit 4b97926 into rust-lang:main May 20, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 20, 2026
@github-actions
Copy link
Copy Markdown
Contributor

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 e50aa6f (parent) -> 4b97926 (this PR)

Test differences

Show 32 test diffs

Stage 1

  • macros::tests::no_leaking_internal_temps_from_dbg_even_on_false_unwind: [missing] -> pass (J1)

Stage 2

  • macros::tests::no_leaking_internal_temps_from_dbg_even_on_false_unwind: [missing] -> pass (J0)

Additionally, 30 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 4b9792692fbb675174d4d2082e7c37b2bc930e71 --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. dist-apple-various: 1h 52m -> 2h 32m (+35.6%)
  2. optional-x86_64-gnu-parallel-frontend: 2h 8m -> 2h 44m (+28.2%)
  3. dist-x86_64-msvc-alt: 2h 11m -> 2h 47m (+27.3%)
  4. dist-i686-msvc: 2h 33m -> 1h 51m (-27.2%)
  5. x86_64-gnu-tools: 51m 11s -> 1h 4m (+26.5%)
  6. i686-msvc-2: 1h 44m -> 2h 11m (+25.8%)
  7. dist-various-2: 35m 15s -> 43m 31s (+23.4%)
  8. dist-x86_64-illumos: 1h 50m -> 1h 27m (-21.0%)
  9. pr-check-1: 32m 12s -> 27m 53s (-13.4%)
  10. x86_64-msvc-ext1: 2h 8m -> 2h 23m (+12.0%)
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.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (4b97926): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary 2.2%)

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

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

Cycles

Results (primary 1.9%, secondary 4.8%)

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

mean range count
Regressions ❌
(primary)
1.9% [1.9%, 1.9%] 1
Regressions ❌
(secondary)
4.8% [4.8%, 4.9%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.9% [1.9%, 1.9%] 1

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 512.018s -> 510.83s (-0.23%)
Artifact size: 400.61 MiB -> 400.58 MiB (-0.01%)

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 20, 2026

beta backport approved as per libs team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels are handled by them.

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 20, 2026
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 20, 2026
@cuviper cuviper modified the milestones: 1.97.0, 1.96.0 May 20, 2026
rust-bors Bot pushed a commit that referenced this pull request May 20, 2026
[beta] Revert tearing changes to dbg! (#156589)

This is a straight cherry-pick of the beta-approved #156589.
rust-bors Bot pushed a commit that referenced this pull request May 20, 2026
[beta] Revert tearing changes to dbg! (#156589)

This is a straight cherry-pick of the beta-approved #156589.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants