-
Notifications
You must be signed in to change notification settings - Fork 13.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove constness
from TraitPredicate
#114202
Conversation
Some changes occurred in src/tools/clippy cc @rust-lang/clippy Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor Some changes occurred in engine.rs, potentially modifying the public API of |
This comment has been minimized.
This comment has been minimized.
080a8de
to
39e556b
Compare
if trait_predicate.is_const_if_const() { | ||
let unsatisfied_const = UnsatisfiedConst(false); | ||
// FIXME(effects) | ||
/* if trait_predicate.is_const_if_const() { | ||
let non_const_predicate = trait_ref.without_const(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we just remove the code instead of leaving it commented out? Can always recover it from history
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably needs to wait until the pretty printing PR lands?
I mean I think this is orthogonal to #114203? Git should know to perform a three-way merge and since these PRs don't modify the same places on the same file it should be fine |
@oli-obk is this good to go now? |
@bors r+ |
📌 Commit 39e556bb635256eb8eb2952913447c9f7b60a026 has been approved by It is now in the queue for this repository. |
☔ The latest upstream changes (presumably #114310) made this pull request unmergeable. Please resolve the merge conflicts. |
39e556b
to
1141207
Compare
This comment has been minimized.
This comment has been minimized.
1141207
to
bb0f9bc
Compare
This comment has been minimized.
This comment has been minimized.
bb0f9bc
to
07868cd
Compare
This comment has been minimized.
This comment has been minimized.
07868cd
to
d6e2fa9
Compare
This comment has been minimized.
This comment has been minimized.
r=me after CI golf succeeds and commits are squashed |
2510858
to
44793d0
Compare
@bors r=oli-obk |
📌 Commit 44793d008f2a5af80666092abf20c358f137f836 has been approved by It is now in the queue for this repository. |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
☔ The latest upstream changes (presumably #114358) made this pull request unmergeable. Please resolve the merge conflicts. |
44793d0
to
4fec845
Compare
Rebased. @bors p=1 r=oli-obk Bitrotty |
☀️ Test successful - checks-actions |
Finished benchmarking commit (20747af): comparison URL. Overall result: ✅ improvements - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Binary sizeResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Bootstrap: 649.933s -> 650.695s (0.12%) |
Any ICEs or compiler errors created by this PR are expected and intended to be fixed in the future.
r? @oli-obk
cc #110395