Use HirId in TraitCandidate. #69108
Merged
Use HirId in TraitCandidate. #69108
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
Zoxc
reviewed
Feb 13, 2020
| @@ -270,7 +270,6 @@ impl<'a> ToStableHashKey<StableHashingContext<'a>> for hir::TraitCandidate { | |||
|
|
|||
| let import_keys = import_ids | |||
There was a problem hiding this comment.
I think this method can just return the fields of TraitCandidate now.
There was a problem hiding this comment.
Maybe just leave it like this for now.
Zoxc
reviewed
Feb 13, 2020
src/librustc_hir/hir.rs
Outdated
| @@ -2588,7 +2588,7 @@ pub type CaptureModeMap = NodeMap<CaptureBy>; | |||
| #[derive(Clone, Debug)] | |||
| pub struct TraitCandidate { | |||
There was a problem hiding this comment.
You could make this generic over the id instead of duplicating it.
|
☔ The latest upstream changes (presumably #69023) made this pull request unmergeable. Please resolve the merge conflicts. |
cjgillot
force-pushed
the
trait_candidate
branch
from
2620198
to
4706c38
Compare
|
@bors r+ |
|
📌 Commit 2a899e2 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 13, 2020
Use HirId in TraitCandidate. I had to duplicate the `TraitMap` type to hold `NodeId`s until AST->HIR lowering is done. r? @Zoxc
bors
added a commit
that referenced
this pull request
Feb 13, 2020
Rollup of 9 pull requests Successful merges: - #68728 (parse: merge `fn` syntax + cleanup item parsing) - #68938 (fix lifetime shadowing check in GATs) - #69057 (expand: misc cleanups and simplifications) - #69108 (Use HirId in TraitCandidate.) - #69125 (Add comment to SGX entry code) - #69126 (miri: fix exact_div) - #69127 (Enable use after scope detection in the new LLVM pass manager) - #69135 (Spelling error "represening" to "representing") - #69141 (Don't error on network failures) Failed merges: r? @ghost
bors
added a commit
that referenced
this pull request
Feb 15, 2020
Revert #69108 ... to see if it caused the regression in #69197. @bors try @rust-timer queue
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 had to duplicate the
TraitMaptype to holdNodeIds until AST->HIR lowering is done.r? @Zoxc