[beta] Rollup backports #62065
Merged
[beta] Rollup backports #62065
Conversation
This file contains 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
|
@bors r+ p=20 |
|
📌 Commit 8a153c4d05ea2463de9419707391866b356021b1 has been approved by |
bors
added
the
S-waiting-on-bors
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
⌛ Testing commit 8a153c4d05ea2463de9419707391866b356021b1 with merge 719d1030f59d2caf3f18d52db9f08eef385aece5... |
|
💔 Test failed - checks-travis |
bors
added
S-waiting-on-review
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
eddyb
reviewed
Jun 24, 2019
| let path_segs = match res { | ||
| Res::Local(_) | Res::Upvar(..) => Vec::new(), | ||
| Res::Local(_) | Res::Upvar(..) | Res::SelfCtor(_) => vec![], |
There was a problem hiding this comment.
This is good, FWIW, Local | Upvar became just Local in between the beta and master branches.
eddyb
approved these changes
Jun 24, 2019
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
The most recent travis failure is from #61199. The change from #61161 (comment) will need to be backported as well. It was part of #61199 but got lost in a rebase. |
I beta-nominated PR #59752 due to this comment. but that comment is making an assertion about PR #59800, which you (@Zoxc) authored, so maybe I misunderstood the comment, or the comment itself was erroneous? |
|
|
|
and I retracted the nomination of #62055. |
Mark-Simulacrum
force-pushed
the
beta-rollup
branch
from
226e1ab
to
a3a29fc
Compare
This reverts commit 8ed2292. It caused doctests in this repository to no longer be tested including all of the core crate.
…caching-perf-3, r=pnkfelix create a "provisional cache" to restore performance in the case of cycles Introduce a "provisional cache" that caches the results of auto trait resolutions but keeps them from entering the *main* cache until everything is ready. This turned out a bit more complex than I hoped, but I don't see another short term fix -- happy to take suggestions! In the meantime, it's very clear we need to rework the trait solver. This resolves the extreme performance slowdown experienced in rust-lang#60846 -- I plan to add a perf.rust-lang.org regression test to track this. Caveat: I've not run `x.py test` in full yet. r? @pnkfelix cc @arielb1 Fixes rust-lang#60846
Mark-Simulacrum
force-pushed
the
beta-rollup
branch
from
a3a29fc
to
939f397
Compare
|
@bors r+ p=1000 |
|
📌 Commit 4b3d9d4 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jun 26, 2019
[beta] Rollup backports Rolled up: * [beta] Comment out dev key #61700 Cherry picked: * Dont ICE on an attempt to use GAT without feature gate #61118 * Fix cfg(test) build for x86_64-fortanix-unknown-sgx #61503 * Handle index out of bound errors during const eval without panic #61598 * Hygienize macros in the standard library #61629 * Fix ICE involving mut references #61947 * rustc_typeck: correctly compute `Substs` for `Res::SelfCtor`. #61896 * Revert "Set test flag when rustdoc is running with --test option" #61199 * create a "provisional cache" to restore performance in the case of cycles #61754 r? @ghost
|
☀️ Test successful - checks-azure, checks-travis, status-appveyor |
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.
Rolled up:
Cherry picked:
SubstsforRes::SelfCtor. rustc_typeck: correctly computeSubstsforRes::SelfCtor. #61896r? @ghost