const-eval: make lint scope computation consistent #126388
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
|
Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri |
rustbot
added
the
T-compiler
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
fmease
reviewed
Jun 13, 2024
| @@ -44,7 +45,7 @@ const TINY_LINT_TERMINATOR_LIMIT: usize = 20; | |||
| const PROGRESS_INDICATOR_START: usize = 4_000_000; | |||
|
|
|||
| /// Extra machine state for CTFE, and the Machine instance | |||
| pub struct CompileTimeInterpreter<'tcx> { | |||
| pub struct CompileTimeMachine<'tcx> { | |||
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
|
☔ The latest upstream changes (presumably #126396) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
…ontext -> CompileTimeInterpCx to match the terms used in the shared interpreter infrastructure
RalfJung
force-pushed
the
const-eval-lint-scope
branch
from
1f955a7 to
54e24c1
Compare
|
@bors r=oli-obk |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 13, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty) - rust-lang#122613 (Don't build a broken/untested profiler runtime on mingw targets) - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126399 (extend the check for LLVM build) Failed merges: - rust-lang#126388 (const-eval: make lint scope computation consistent) r? `@ghost` `@rustbot` modify labels: rollup
|
The job Click to see the possible cause of the failure (guessed by this bot) |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 13, 2024
…oli-obk const-eval: make lint scope computation consistent The first commit is some renaming for consistency, but otherwise unrelated. It just didn't feel worth a separate PR, but I can split this up if you prefer. r? `@oli-obk`
This was referenced Jun 13, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 13, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments) - rust-lang#126088 ([1/2] clean-up / general improvements) - rust-lang#126238 (Fix Miri sysroot for `x run`) - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist) - rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver) - rust-lang#126371 (Tweak output of import suggestions) - rust-lang#126388 (const-eval: make lint scope computation consistent) - rust-lang#126390 (Fix wording in {checked_}next_power_of_two) - rust-lang#126392 (Small style improvement in `gvn.rs`) - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 14, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments) - rust-lang#126088 ([1/2] clean-up / general improvements) - rust-lang#126238 (Fix Miri sysroot for `x run`) - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist) - rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver) - rust-lang#126371 (Tweak output of import suggestions) - rust-lang#126388 (const-eval: make lint scope computation consistent) - rust-lang#126390 (Fix wording in {checked_}next_power_of_two) - rust-lang#126392 (Small style improvement in `gvn.rs`) - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 14, 2024
Rollup merge of rust-lang#126388 - RalfJung:const-eval-lint-scope, r=oli-obk const-eval: make lint scope computation consistent The first commit is some renaming for consistency, but otherwise unrelated. It just didn't feel worth a separate PR, but I can split this up if you prefer. r? ``@oli-obk``
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The first commit is some renaming for consistency, but otherwise unrelated. It just didn't feel worth a separate PR, but I can split this up if you prefer.
r? @oli-obk