Skip to content

Fix #45268 by saving all NodeId's for resolved traits. #60415

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
May 5, 2019
Merged

Fix #45268 by saving all NodeId's for resolved traits. #60415

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5deec30
Fix #45268 by saving all NodeId's for resolved traits.
jespersm Apr 30, 2019
5d2be7d
Fix misleading indentation
jespersm May 1, 2019
a300cab
Revert the introduced typedefs
jespersm May 2, 2019
7198905
Improved name: first_import_id
jespersm May 2, 2019
42255d9
Reuse 'kind' parameter.
jespersm May 2, 2019
7dbb5e3
Use binding autoref, because we can.
jespersm May 2, 2019
fc34d5f
Removed unneccesary reference for trait name
jespersm May 2, 2019
6802082
Hash all of the import_ids for the TraitCandidate.
jespersm May 2, 2019
6da7649
Delegate SmallVec's stable_hash to array's stable_hash.
jespersm May 2, 2019
f5b5ca8
Revert Cargo.lock changes accidentally introduced during rebase
petrochenkov May 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use binding autoref, because we can.
  • Loading branch information
@jespersm
jespersm committed May 4, 2019
commit 7dbb5e3b49b00c6bf0ce7b0e11a32eee38aeb8a3
4 changes: 2 additions & 2 deletions src/librustc/ich/impls_hir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ impl<'a> HashStable<StableHashingContext<'a>> for hir::TraitCandidate {
hcx: &mut StableHashingContext<'a>,
hasher: &mut StableHasher<W>) {
hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| {
let &hir::TraitCandidate {
let hir::TraitCandidate {
def_id,
import_ids,
} = &self;
} = self;

def_id.hash_stable(hcx, hasher);
// We only use the outermost import NodeId as key
Expand Down