Skip to content

Get rid of EscapeDebugInner. - #138237

Merged
bors merged 1 commit into
rust-lang:masterfrom
reitermarkus:remove-escape-debug-inner
Jun 19, 2025
Merged

Get rid of EscapeDebugInner.#138237
bors merged 1 commit into
rust-lang:masterfrom
reitermarkus:remove-escape-debug-inner

Conversation

@reitermarkus

@reitermarkusreitermarkus commented Mar 8, 2025

Copy link
Copy Markdown
Contributor

I read the note on EscapeDebugInner and thought I'd give it a try.

@rustbot

rustbot commented Mar 8, 2025

Copy link
Copy Markdown
Collaborator

r? @thomcc

rustbot has assigned @thomcc.
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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 8, 2025
@reitermarkus
reitermarkusforce-pushed the remove-escape-debug-inner branch 3 times, most recently from 57c0a80 to 0854482CompareMarch 8, 2025 20:52
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/char/mod.rs
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
hkBst
hkBst reviewed Mar 9, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs
reitermarkus
reitermarkus commented Mar 10, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
reitermarkus
reitermarkus commented Mar 10, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
reitermarkus
reitermarkus commented Mar 10, 2025
View reviewed changes
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
Comment threadlibrary/core/src/escape.rs Outdated
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@reitermarkus
reitermarkus requested a review from hkBstMarch 10, 2025 17:43
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@hkBst

hkBst commented Mar 11, 2025•
edited
Loading

Copy link
Copy Markdown
Member
- // SAFETY: `self.data.escape_seq` contains an escape sequence, as is - // guaranteed by the caller, and in that case `self.alive` is guaranteed + // SAFETY: `self.data.escape_seq` contains an escape sequence, as is
+ // guaranteed by the caller, and in that case `self.alive` is guaranteed

I'm sure you know this, but if you highlight these lines, you can see that the trailing space is the problem.

@tgross35tgross35 mentioned this pull request Jun 16, 2025
Closed
bors added a commit that referenced this pull request Jun 16, 2025
@bors
Auto merge of#142558- tgross35:rollup-ld8nn4w, r=tgross35
befb020
Rollup of 7 pull requests
Successful merges:
- #138237 (Get rid of `EscapeDebugInner`.)
- #140809 (Reduce special casing for the panic runtime)
- #141990 (Implement send_signal for unix child processes)
- #142082 (Refactor `rustc_attr_data_structures` documentation)
- #142125 (Stabilize "file_lock" feature)
- #142528 (clarify `rustc_do_not_const_check` comment)
- #142530 (use `if let` guards where possible)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jun 16, 2025
@bors
Auto merge of#138237- reitermarkus:remove-escape-debug-inner, r=tgr…
b0eab47
…oss35
Get rid of `EscapeDebugInner`.
I read the note on `EscapeDebugInner` and thought I'd give it a try.
@bors

bors commented Jun 16, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ce457e1 with merge b0eab47...

@borsbors mentioned this pull request Jun 16, 2025
Merged
@rust-log-analyzer

rust-log-analyzer commented Jun 16, 2025

Copy link
Copy Markdown
Collaborator

The job dist-i586-gnu-i586-i686-musl failed! Check out the build log: (web)(plain)

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

@bors

bors commented Jun 16, 2025

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Jun 16, 2025
@tgross35

tgross35 commented Jun 17, 2025

Copy link
Copy Markdown
Member

Seems unrelated?

@bors2 try jobs=dist-i586-gnu-i586-i686-musl

@rust-bors

rust-borsBot commented Jun 17, 2025

Copy link
Copy Markdown
Contributor

Unknown value for argument "jobs".

@tgross35

tgross35 commented Jun 17, 2025

Copy link
Copy Markdown
Member

Should be...
@bors2 try jobs=dist-i586-gnu-i586-i686-musl

@rust-bors

rust-borsBot commented Jun 17, 2025

Copy link
Copy Markdown
Contributor

⌛ Trying commit ce457e1 with merge 68d5650…

To cancel the try build, run the command @bors2 try cancel.

rust-borsBot added a commit that referenced this pull request Jun 17, 2025
@rust-bors
Auto merge of#138237- reitermarkus:remove-escape-debug-inner, r=<try>
68d5650
Get rid of `EscapeDebugInner`.
<!-- homu-ignore:start -->
<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.
This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using
r? <reviewer name>
-->
<!-- homu-ignore:end -->
I read the note on `EscapeDebugInner` and thought I'd give it a try.
try-job: dist-i586-gnu-i586-i686-musl
@rust-bors

rust-borsBot commented Jun 17, 2025

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 68d5650 (68d56507c033370b3289981f6c124b8c4e6917d8, parent: 55d436467c351b56253deeba209ae2553d1c243f)

@tgross35

tgross35 commented Jun 17, 2025

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 17, 2025

Copy link
Copy Markdown
Collaborator

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Sized Hierarchy: Part I #137944

@bors

bors commented Jun 17, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit ce457e1 has been approved by tgross35

It is now in the queue for this repository.

@borsbors 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 Jun 17, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 18, 2025
@jhpratt
Rollup merge ofrust-lang#138237- reitermarkus:remove-escape-debug-i…
b89fd7c
…nner, r=tgross35
Get rid of `EscapeDebugInner`.
I read the note on `EscapeDebugInner` and thought I'd give it a try.
@jhprattjhpratt mentioned this pull request Jun 18, 2025
Closed
bors added a commit that referenced this pull request Jun 18, 2025
@bors
Auto merge of#142656- jhpratt:rollup-46k4zk0, r=jhpratt
0e33ae2
Rollup of 10 pull requests
Successful merges:
- #135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
- #138237 (Get rid of `EscapeDebugInner`.)
- #140772 ({aarch64,x86_64}-pc-windows-gnullvm: build host tools)
- #140774 (Affirm `-Cforce-frame-pointers=off` does not override)
- #141610 (Stabilize `feature(generic_arg_infer)`)
- #141864 (Handle win32 separator for cygwin paths)
- #142384 (Bringing `rustc_rayon_core` in tree as `rustc_thread_pool`)
- #142502 (rustdoc_json: improve handling of generic args)
- #142571 (Reason about borrowed classes in CopyProp.)
- #142591 (Add spawn APIs for BootstrapCommand to support deferred command execution)
r? `@ghost`
`@rustbot` modify labels: rollup
@UrgauUrgau mentioned this pull request Jun 18, 2025
Merged
bors added a commit that referenced this pull request Jun 18, 2025
@bors
Auto merge of#142689- Urgau:rollup-4ho6835, r=Urgau
044514e
Rollup of 6 pull requests
Successful merges:
- #135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
- #138237 (Get rid of `EscapeDebugInner`.)
- #141614 (lint direct use of rustc_type_ir )
- #142123 (Implement initial support for timing sections (`--json=timings`))
- #142377 (Try unremapping compiler sources)
- #142674 (remove duplicate crash test)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 6e2a26e into rust-lang:masterJun 19, 2025
@rustbotrustbot added this to the 1.89.0 milestone Jun 19, 2025
github-actionsBot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jun 19, 2025
@bors
Auto merge of #142689 - Urgau:rollup-4ho6835, r=Urgau
ad5bc32
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
- rust-lang/rust#138237 (Get rid of `EscapeDebugInner`.)
- rust-lang/rust#141614 (lint direct use of rustc_type_ir )
- rust-lang/rust#142123 (Implement initial support for timing sections (`--json=timings`))
- rust-lang/rust#142377 (Try unremapping compiler sources)
- rust-lang/rust#142674 (remove duplicate crash test)
r? `@ghost`
`@rustbot` modify labels: rollup
tautschnig pushed a commit to model-checking/verify-rust-std that referenced this pull request Jul 3, 2025
@Urgau
Rollup merge ofrust-lang#138237- reitermarkus:remove-escape-debug-i…
56db306
…nner, r=tgross35
Get rid of `EscapeDebugInner`.
I read the note on `EscapeDebugInner` and thought I'd give it a try.
tautschnig pushed a commit to model-checking/verify-rust-std that referenced this pull request Jul 3, 2025
@bors
Auto merge ofrust-lang#142689- Urgau:rollup-4ho6835, r=Urgau
b4d4339
Rollup of 6 pull requests
Successful merges:
- rust-lang#135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
- rust-lang#138237 (Get rid of `EscapeDebugInner`.)
- rust-lang#141614 (lint direct use of rustc_type_ir )
- rust-lang#142123 (Implement initial support for timing sections (`--json=timings`))
- rust-lang#142377 (Try unremapping compiler sources)
- rust-lang#142674 (remove duplicate crash test)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tgross35tgross35tgross35 approved these changes
+1 more reviewer
@hkBsthkBsthkBst left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@tgross35tgross35

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.89.0

Development

Successfully merging this pull request may close these issues.

8 participants

@reitermarkus@rustbot@rust-log-analyzer@hkBst@tgross35@rust-timer@bors@thomcc