Skip to content

Conversation

Stypox
Copy link
Contributor

@Stypox Stypox commented Jun 11, 2025

This is a followup to #140972, where I made a silly mistake and forgot to update $crate::interpret::tracing_utils::... to $crate::interpret::util::... inside the macro after moving the referenced code from tracing_utils.rs to util.rs. Sorry about this.

r? @RalfJung

@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 Jun 11, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 11, 2025

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

@RalfJung
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 11, 2025

📌 Commit cd04717 has been approved by RalfJung

It is now in the queue for this repository.

@bors bors 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 11, 2025
bors added a commit that referenced this pull request Jun 11, 2025
Rollup of 9 pull requests

Successful merges:

 - #142305 (Remove unneeded `check_id` calls as they are already called in `visit_id` in `EarlyContextAndPass` type)
 - #142314 (remove ice group pings from `triagebot.toml`)
 - #142343 (remove myself from the project)
 - #142346 (Add tracing import to execution context)
 - #142356 (Fix enter_trace_span!() using wrong $crate paths)
 - #142362 (Add expectation for `{` when parsing lone coroutine qualifiers)
 - #142364 (Do not warn on `rust.incremental` when using download CI rustc)
 - #142369 (Improve some attribute docs and rename groups)
 - #142374 (Fix missing newline trim in bootstrap)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e2846d6 into rust-lang:master Jun 12, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 12, 2025
rust-timer added a commit that referenced this pull request Jun 12, 2025
Rollup merge of #142356 - Stypox:fix-enter_trace_span, r=RalfJung

Fix enter_trace_span!() using wrong $crate paths

This is a followup to #140972, where I made a silly mistake and forgot to update `$crate::interpret::tracing_utils::...` to `$crate::interpret::util::...` inside the macro after moving the referenced code from `tracing_utils.rs` to `util.rs`. Sorry about this.

r? `@RalfJung`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants