Skip to content

[beta] Revert tearing changes to dbg! (#156589)#156772

Merged
rust-bors[bot] merged 4 commits into
rust-lang:betafrom
cuviper:beta-next
May 20, 2026
Merged

[beta] Revert tearing changes to dbg! (#156589)#156772
rust-bors[bot] merged 4 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper
Copy link
Copy Markdown
Member

@cuviper cuviper commented May 20, 2026 •
edited by rustbot
Loading

This is a straight cherry-pick of the beta-approved #156589.

cuviper and others added 4 commits May 20, 2026 05:38
@cuviper
Revert "Rollup merge of rust-lang#154994 - dianne:no-dbg-temp, r=Mark…
01f6bb5 
…-Simulacrum"

This reverts commit 59b36a5, reversing
changes made to 197eb8c.

(cherry picked from commit 73931c4)
@cuviper
Revert "Rollup merge of rust-lang#154074 - dianne:dbg-temp-scopes, r=…
54d99c2 
…Mark-Simulacrum"

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

(cherry picked from commit c9d9448)
@cuviper
Revert "Rollup merge of rust-lang#149869 - joboet:torn-dbg, r=Mark-Si…
69cd658 
…mulacrum"

This reverts commit cc666ba, reversing
changes made to 2da5959.

(cherry picked from commit 9246e19)
@cuviper @dianne
Restore dbg! regression tests
10a3a2b 
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>
(cherry picked from commit 6f35b83)
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 20, 2026

The Miri subtree was changed

cc @rust-lang/miri

The Clippy subtree was changed

cc @rust-lang/clippy

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 20, 2026
@rustbot rustbot added 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. labels May 20, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 20, 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 20, 2026

@bors r+ rollup=never

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 20, 2026

📌 Commit 10a3a2b has been approved by cuviper

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

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request May 20, 2026
@bors
Auto merge of #156772 - cuviper:beta-next, r=cuviper
286782c 
[beta] Revert tearing changes to dbg! (#156589)

This is a straight cherry-pick of the beta-approved #156589.
@rust-bors rust-bors Bot 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 May 20, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 20, 2026

💔 Test for 286782c failed: CI. Failed job:

@cuviper
Copy link
Copy Markdown
Member Author

cuviper commented May 20, 2026

Spurious DNS error

@bors retry

@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 20, 2026
@cuviper
Copy link
Copy Markdown
Member Author

cuviper commented May 20, 2026

@bors p=1

@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

rust-log-analyzer commented May 20, 2026

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

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

@rust-bors rust-bors Bot mentioned this pull request May 20, 2026
Merged
@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 May 20, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 20, 2026

☀️ Test successful - CI
Approved by: cuviper
Duration: 3h 24m 2s
Pushing 773b57f to beta...

@rust-bors rust-bors Bot merged commit 773b57f into rust-lang:beta May 20, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone May 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cuviper cuviper

Labels

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

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

3 participants

@cuviper @rustbot @rust-log-analyzer