-
Notifications
You must be signed in to change notification settings - Fork 12.4k
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
Rebased refactorings for Chalk #47861
Rebased refactorings for Chalk #47861
Conversation
☔ The latest upstream changes (presumably #47837) made this pull request unmergeable. Please resolve the merge conflicts. |
... Well that didn't last for long, did it? |
37c4b69
to
cd8bc39
Compare
@bors try I'd like do some perf measurements on this. |
…, r=<try> Rebased refactorings for Chalk The code is Niko's, I just handled the rebase. r? @nikomatsakis
☀️ Test successful - status-travis |
@Mark-Simulacrum Perf needed, |
Perf started. ETA around 45-50 minutes. |
@Mark-Simulacrum ping :) |
@kennytm thanks! =) |
@nikomatsakis @sgrif what's the status on this? |
I'm going to look into the perf today |
0082951 is not the problem |
Should be good to go now |
@bors try Should we repeat the perf run? seems like a reasonable thing to do. |
@bors clean retry try |
🔒 Merge conflict |
🔒 Merge conflict |
These changes were meant to be in 2b18d8fe9dc05415a8e6b7cadf879c7f7ebe020a (rebased from 12a2305), but I messed up the rebase a bit as the file had been moved.
These modules were replaced with re-exports from ena
Additional uses of this item were added to these files in rust-lang#45701 and rust-lang#46479
c16caff
to
fec4d3b
Compare
I rebased again, though there were no merge conflicts... :/ |
@bors r+ |
📌 Commit fec4d3b has been approved by |
…, r=nikomatsakis Rebased refactorings for Chalk The code is Niko's, I just handled the rebase. r? @nikomatsakis
☀️ Test successful - status-appveyor, status-travis |
large perf regression when this landed http://perf.rust-lang.org/compare.html?start=3eeb5a665e313c5b281820099e04d4c6c8188b46&end=ddfbf2b0f4726f11bc8e857274ae1a0f8343a73f&stat=instructions:u can it be the bump of ena that changed the times after the last perf run? |
@ishitatsuyuki opened #48660 to track the perf regression, but I think we ought to roll it back till we understand the cause. Could be the bump of ena, thought that would be quite surprising. |
This reverts commit ccd92c2. This commit is the source of a major perf regression, and was not intended to be included in rust-lang#47861. At some point I must have accidentally re-added the commit.
Revert "correct subtle bug in the type variable code" This reverts commit ccd92c2. This commit is the source of a major perf regression, and was not intended to be included in #47861. At some point I must have accidentally re-added the commit. Fixes #48660. r? @nikomatsakis
The code is Niko's, I just handled the rebase.
r? @nikomatsakis