mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #36795 - TimNN:fix-36793, r=eddyb

Browse Source 
TypeIdHasher: hash usize as u64

Fixes #36793.
This commit is contained in:
Jonathan Turner 2016-09-28 10:33:58 -07:00 committed by GitHub
commit 46746012e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/ty/util.rs
View File

@ -436,7 +436,7 @@ fn visit_ty(&mut self, ty: Ty<'tcx>) -> bool {
TyInt(i) => self.hash(i),
TyUint(u) => self.hash(u),
TyFloat(f) => self.hash(f),
TyArray(_, n) => self.hash(n),
TyArray(_, n) => self.hash(n as u64),
TyRawPtr(m) |
TyRef(_, m) => self.hash(m.mutbl),
TyClosure(def_id, _) |
@ -447,14 +447,14 @@ fn visit_ty(&mut self, ty: Ty<'tcx>) -> bool {
self.hash(f.unsafety);
self.hash(f.abi);
self.hash(f.sig.variadic());
self.hash(f.sig.inputs().skip_binder().len());
self.hash(f.sig.inputs().skip_binder().len() as u64);
}
TyTrait(ref data) => {
self.def_id(data.principal.def_id());
self.hash(data.builtin_bounds);
}
TyTuple(tys) => {
self.hash(tys.len());
self.hash(tys.len() as u64);
}
TyParam(p) => {
self.hash(p.idx);