Skip to content

Commit 90794dd

Browse files
committed
---
yaml --- r: 150731 b: refs/heads/try2 c: 2803b38 h: refs/heads/master i: 150729: d3d1083 150727: 214703c v: v3
1 parent 2869f63 commit 90794dd

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: b61764b609c5669e27b5dd0a43d302bb4b54b0c2
8+
refs/heads/try2: 2803b383f099e71d6eb885d0ea7c01d771dc7e46
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/ty.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4595,16 +4595,6 @@ pub fn hash_crate_independent(tcx: &ctxt, t: t, svh: &Svh) -> u64 {
45954595
}
45964596
}
45974597
};
4598-
let vstore = |state: &mut sip::SipState, v: Vstore| {
4599-
match v {
4600-
VstoreFixed(_) => 0u8.hash(state),
4601-
VstoreUniq => 1u8.hash(state),
4602-
VstoreSlice(r) => {
4603-
2u8.hash(state);
4604-
region(state, r);
4605-
}
4606-
}
4607-
};
46084598
let did = |state: &mut sip::SipState, did: DefId| {
46094599
let h = if ast_util::is_local(did) {
46104600
svh.clone()
@@ -4652,7 +4642,7 @@ pub fn hash_crate_independent(tcx: &ctxt, t: t, svh: &Svh) -> u64 {
46524642
ty_vec(m, v) => {
46534643
byte!(11);
46544644
mt(&mut state, m);
4655-
vstore(&mut state, v);
4645+
hash!(v);
46564646
}
46574647
ty_ptr(m) => {
46584648
byte!(12);

0 commit comments

Comments
 (0)