Skip to content

Conversation

RalfJung
Copy link
Member

Also add a doc comment to cur_span.

r? @compiler-errors

@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 13, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 13, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@RalfJung RalfJung force-pushed the find_closest_untracked_caller_location branch from 14af33c to d87ec03 Compare June 13, 2024 07:09
@@ -250,7 +250,7 @@ impl<'tcx, Prov: Provenance> Frame<'tcx, Prov> {
impl<'tcx, Prov: Provenance, Extra> Frame<'tcx, Prov, Extra> {
/// Get the current location within the Frame.
///
/// If this is `Left`, we are not currently executing any particular statement in
/// If this is `Right`, we are not currently executing any particular statement in
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also just realized this comment is wrong, and fixed it.

@oli-obk
Copy link
Contributor

oli-obk commented Jun 13, 2024

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 13, 2024

📌 Commit d87ec03 has been approved by oli-obk

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 13, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2024
Rollup of 6 pull requests

Successful merges:

 - rust-lang#126347 (Simplify `try_*`'s signature on `Iterator`)
 - rust-lang#126348 (Improve error message if dependency installation in tidy fails)
 - rust-lang#126366 (Add a new trait to retrieve StableMir definition Ty)
 - rust-lang#126370 (compiletest: Stricter parsing of `//@ normalize-*` headers)
 - rust-lang#126379 (interpret: update doc comment for find_closest_untracked_caller_location)
 - rust-lang#126384 (add tracking issue for is_none_or)

Failed merges:

 - rust-lang#126388 (const-eval: make lint scope computation consistent)

r? `@ghost`
`@rustbot` modify labels: rollup
@compiler-errors
Copy link
Member

Thanks!

@bors bors merged commit 393b526 into rust-lang:master Jun 13, 2024
@rustbot rustbot added this to the 1.81.0 milestone Jun 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2024
Rollup merge of rust-lang#126379 - RalfJung:find_closest_untracked_caller_location, r=oli-obk

interpret: update doc comment for find_closest_untracked_caller_location

Also add a doc comment to cur_span.

r? `@compiler-errors`
@RalfJung RalfJung deleted the find_closest_untracked_caller_location branch June 13, 2024 18:45
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.

5 participants