Remove the CoroutineWitness type
#144157
Open
Remove the CoroutineWitness type
#144157
+311
−662
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
PG-exploit-mitigations
|
@bors2 try @rust-timer queue (and crater when it's ready) |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
added a commit
that referenced
this pull request
Jul 18, 2025
Remove the `CoroutineWitness` type It's no longer needed, since it just always the `Coroutine` that it's contained within. This PR reworks a bit of obligation stalling logic and dtorck constraint behavior, but otherwise it's pretty straightforward. r? `@lcnr` or reassign (e.g. to oli, who probably would also be down to review)
rustbot
added
the
S-waiting-on-perf
This comment has been minimized.
This comment has been minimized.
compiler-errors
commented
Jul 18, 2025
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (0282016): comparison URL. Overall result: ✅ improvements - no action neededBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (secondary -3.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeResults (primary -0.0%, secondary -0.3%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Bootstrap: 465.311s -> 466.27s (0.21%) |
rustbot
removed
the
S-waiting-on-perf
|
@craterbot check |
|
👌 Experiment ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more |
craterbot
added
S-waiting-on-crater
lcnr
reviewed
Jul 21, 2025
lcnr
reviewed
Jul 21, 2025
compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs
Outdated
Show resolved
Hide resolved
lcnr
reviewed
Jul 21, 2025
compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
Outdated
Show resolved
Hide resolved
lcnr
reviewed
Jul 21, 2025
| }) | ||
| } else { | ||
| unreachable!( | ||
| "tried to assemble `Sized` for coroutine without enabled feature" |
There was a problem hiding this comment.
why does the copy_clone_conditions talk about Sized in the ICE msg xd
There was a problem hiding this comment.
Copy paste mistake
lcnr
reviewed
Jul 21, 2025
lcnr
reviewed
Jul 21, 2025
lcnr
reviewed
Jul 21, 2025
lcnr
reviewed
Jul 21, 2025
No, coroutine-closures don't actually really "contain" a witness, and don't use it in their copy/clone and auto trait impls anyways. The fact it stores a witness in its vars is kinda just for convenience for constructing the coroutine type when computing the return type. |
compiler-errors
force-pushed
the
no-witness
branch
from
a25d83f to
56c25c2
Compare
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
no-witness
branch
from
56c25c2 to
4625cb5
Compare
|
I'll land this after #144156, unless you expect that PR to be blocked for some reason. In that case, I'd prefer if we invert the stack of these and land this PR without the first commit, and then rebase THAT one to use the new logic for checking the drop-ness of the interior types. |
|
I'll take this out of draft for the pings and to mark it as blocked. |
rustbot
added
the
S-waiting-on-review
|
Some changes occurred in compiler/rustc_sanitizers cc @rcvalle Some changes occurred to the CTFE machinery changes to the core type system Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 Some changes occurred in src/tools/clippy cc @rust-lang/clippy Some changes occurred to the CTFE / Miri interpreter cc @rust-lang/miri Some changes occurred in exhaustiveness checking cc @Nadrieril This PR changes rustc_public cc @oli-obk, @celinval, @ouz-a Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Some changes occurred in compiler/rustc_codegen_ssa |
|
@rustbot blocked |
rustbot
added
S-blocked
compiler-errors
force-pushed
the
no-witness
branch
from
4625cb5 to
4f96428
Compare
This comment has been minimized.
This comment has been minimized.
It needs a types FCP, so we could merge this PR without the change from #144156. |
|
🚧 Experiment ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more |
compiler-errors
force-pushed
the
no-witness
branch
from
4f96428 to
2aba321
Compare
|
The job Click to see the possible cause of the failure (guessed by this bot) |
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.
It's no longer needed, since it always just matches the def id and substs of the
Coroutinethat it's contained within.This PR reworks a bit of obligation stalling logic and dtorck constraint behavior, but otherwise it's pretty straightforward.
This luckily was very easy to do because of the setup work in:
CoroutineWitnesssooner in typeck, and stall coroutine obligations based off ofTypingEnv#141762r? @lcnr or reassign (e.g. to oli, who probably would also be down to review)