Uh oh!
There was an error while loading. Please reload this page.
Rollup of 7 pull requests - #65896
Closed
JohnTitor wants to merge 21 commits into
Closed
Conversation
… pretty-printing mechanism.
…ation event. Before this commit, we had an event that would only track the compression step for proc-macros and Rust dylibs. After the commit we measure the time for acutally generating the crate metadata bytes.
…nikomatsakis Custom lifetime error for `impl` item doesn't conform to `trait` Partly addresses rust-lang#42706, rust-lang#41343, fixrust-lang#40900.
Improve the "try using a variant of the expected type" hint. Fixrust-lang#65494. - Change type-printing output. - Use `span_to_snippet` when possible. - Change the message to `try using a variant of the expected enum`
…-E0587, r=Dylan-DPC Add long error explanation for E0587 Part of rust-lang#61137. r? @kinnison
…st-placeholder, r=eddyb Correct handling of type flags with `ConstValue::Placeholder` This fixes a mistake, but not rust-lang#65623. r? @eddyb
rustc: use IndexVec<DefIndex, T> instead of Vec<T>. Now that `DefIndex` is a proper index type, we can do that. There was also an unnecessary `Option` I removed, I wonder if that has perf implications.
doc: mention `get(_mut)` in Vec
… r=wesleywiser self-profiling: Record something more useful for crate metadata generation event. Before this commit, we had an event that would only track the compression step for proc-macros and Rust dylibs. After the commit we measure the time for acutally generating the crate metadata bytes. r? @wesleywiser
JohnTitor
commented
Oct 28, 2019
MemberAuthor
@bors r+ p=7 rollup=never |
bors
commented
Oct 28, 2019
Collaborator
📌 Commit 6d092ac has been approved by |
bors
commented
Oct 28, 2019
Collaborator
☔ The latest upstream changes (presumably #65421) made this pull request unmergeable. Please resolve the merge conflicts. |
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
Successful merges:
implitem doesn't conform totrait#65068 (Custom lifetime error forimplitem doesn't conform totrait)ConstValue::Placeholder#65643 (Correct handling of type flags withConstValue::Placeholder)get(_mut)in Vec #65887 (doc: mentionget(_mut)in Vec)Failed merges:
r? @ghost