Remove duplicate predicates in explicit_predicates_of
#54780
Merged
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
rust-highfive
added
the
S-waiting-on-review
ljedrz
reviewed
Oct 3, 2018
|
|
||
| fn push(&mut self, value: (ty::Predicate<'tcx>, Span)) { | ||
| if self.uniques.insert(value) { | ||
| self.predicates.push(value); |
There was a problem hiding this comment.
Do predicates need to contain copies of the elements in uniques? Since both have the same elements and the Vec is used only (as far as I understand) to keep the order, maybe it could hold just references to the elements in uniques instead? On the other hand, Predicate is Copy...
There was a problem hiding this comment.
Yes everything is Copy (these are references to arena-allocated memory) so I didn’t care to do such an optimization :)
|
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 |
scalexm
force-pushed
the
dup-predicates
branch
from
966afaf
to
8327976
Compare
nikomatsakis
approved these changes
Oct 3, 2018
| /// compile-fail UI tests. | ||
| struct UniquePredicates<'tcx> { | ||
| predicates: Vec<(ty::Predicate<'tcx>, Span)>, | ||
| uniques: FxHashSet<(ty::Predicate<'tcx>, Span)>, |
There was a problem hiding this comment.
Hmm, I wonder if we should add the indexmap crate and use that instead.
|
@bors r+ |
|
📌 Commit 8327976 has been approved by |
bors
added
S-waiting-on-bors
pietroalbini
added a commit
to pietroalbini/rust
that referenced
this pull request
Oct 3, 2018
Remove duplicate predicates in `explicit_predicates_of` I took a more brutal approach than described in rust-lang#52187. I could have used the `linked_hash_map` crate but this seems overkill, especially as we need a vec storage in the end. r? @nikomatsakis
pietroalbini
added a commit
to pietroalbini/rust
that referenced
this pull request
Oct 4, 2018
Remove duplicate predicates in `explicit_predicates_of` I took a more brutal approach than described in rust-lang#52187. I could have used the `linked_hash_map` crate but this seems overkill, especially as we need a vec storage in the end. r? @nikomatsakis
bors
added a commit
that referenced
this pull request
Oct 4, 2018
Rollup of 10 pull requests Successful merges: - #53523 (Add doc for impl From for Std Error) - #54746 (simplify some unused lints code) - #54761 (Make spec_extend use for_each()) - #54769 (Fix typo in CONTRIBUTING.md) - #54773 (Update a FIXME in memory.rs) - #54777 (abolish ICE when pretty-printing async block) - #54780 (Remove duplicate predicates in `explicit_predicates_of`) - #54788 (A handful of cleanups for rustc/mir) - #54789 (Introduce `TyKind::UnnormalizedProjection`) - #54795 (remove padding from multiline format string label) Failed merges: r? @ghost
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.
I took a more brutal approach than described in #52187. I could have used the
linked_hash_mapcrate but this seems overkill, especially as we need a vec storage in the end.r? @nikomatsakis