nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-30 16:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dogfood test

Browse Source
This commit is contained in:
xd009642 2019-07-28 09:31:05 +01:00
parent 03c543515a
commit 78ebcaa526
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clippy_lints/src/utils/hir_utils.rs
View File

@ -438,7 +438,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
self.hash_expr(fun); self.hash_expr(fun);
self.hash_exprs(args); self.hash_exprs(args);
}, },
ExprKind::Cast(ref e, ref ty) => { ExprKind::Cast(ref e, ref ty) | ExprKind::Type(ref e, ref ty) => {
self.hash_expr(e); self.hash_expr(e);
self.hash_ty(ty); self.hash_ty(ty);
}, },
@ -518,10 +518,6 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
ExprKind::Array(ref v) => { ExprKind::Array(ref v) => {
self.hash_exprs(v); self.hash_exprs(v);
}, },
ExprKind::Type(ref e, ref ty) => {
self.hash_expr(e);
self.hash_ty(ty);
},
ExprKind::Unary(lop, ref le) => { ExprKind::Unary(lop, ref le) => {
lop.hash(&mut self.s); lop.hash(&mut self.s);
self.hash_expr(le); self.hash_expr(le);
@ -585,7 +581,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
pub fn hash_lifetime(&mut self, lifetime: &Lifetime) { pub fn hash_lifetime(&mut self, lifetime: &Lifetime) {
std::mem::discriminant(&lifetime.name).hash(&mut self.s); std::mem::discriminant(&lifetime.name).hash(&mut self.s);
if let LifetimeName::Param(ref name) = lifetime.name { if let LifetimeName::Param(ref name) = lifetime.name {
std::mem::discriminant(&name).hash(&mut self.s); std::mem::discriminant(name).hash(&mut self.s);
match name { match name {
ParamName::Plain(ref ident) => { ParamName::Plain(ref ident) => {
ident.name.hash(&mut self.s); ident.name.hash(&mut self.s);
@ -603,7 +599,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
} }
pub fn hash_tykind(&mut self, ty: &TyKind) { pub fn hash_tykind(&mut self, ty: &TyKind) {
std::mem::discriminant(&ty).hash(&mut self.s); std::mem::discriminant(ty).hash(&mut self.s);
match ty { match ty {
TyKind::Slice(ty) => { TyKind::Slice(ty) => {
self.hash_ty(ty); self.hash_ty(ty);