Uh oh!
There was an error while loading. Please reload this page.
Remove constness from TraitPredicate - #114202
Conversation
rustbot
commented
Jul 29, 2023
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.
There was a problem hiding this comment.
should we just remove the code instead of leaving it commented out? Can always recover it from history
oli-obk
left a comment
There was a problem hiding this comment.
probably needs to wait until the pretty printing PR lands?
fee1-dead
commented
Jul 29, 2023
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 |
fee1-dead
commented
Jul 30, 2023
@oli-obk is this good to go now? |
oli-obk
commented
Jul 31, 2023
@bors r+ |
bors
commented
Jul 31, 2023
📌 Commit 39e556bb635256eb8eb2952913447c9f7b60a026 has been approved by It is now in the queue for this repository. |
bors
commented
Aug 1, 2023
☔ The latest upstream changes (presumably #114310) made this pull request unmergeable. Please resolve the merge conflicts. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
oli-obk
commented
Aug 1, 2023
r=me after CI golf succeeds and commits are squashed |
fee1-dead
commented
Aug 1, 2023
@bors r=oli-obk |
bors
commented
Aug 1, 2023
📌 Commit 44793d008f2a5af80666092abf20c358f137f836 has been approved by It is now in the queue for this repository. |
bors
commented
Aug 2, 2023
🔒 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 |
bors
commented
Aug 2, 2023
☔ The latest upstream changes (presumably #114358) made this pull request unmergeable. Please resolve the merge conflicts. |
fee1-dead
commented
Aug 2, 2023
Rebased. @bors p=1 r=oli-obk Bitrotty |
bors
commented
Aug 2, 2023
bors
commented
Aug 2, 2023
bors
commented
Aug 2, 2023
☀️ Test successful - checks-actions |
rust-timer
commented
Aug 3, 2023
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