nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-12 18:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cargo crash

Browse Source
This commit is contained in:
Philipp Hansch 2020-04-26 13:45:47 +02:00
parent 0a49935270
commit eda73fe707
No known key found for this signature in database
GPG Key ID: 2B4399C4BF4DCBDE
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clippy_lints/src/types.rs
View File

@ -2460,14 +2460,13 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ImplicitHasherConstructorVisitor<'a, 'b, 't
if_chain! { if_chain! {
if let ExprKind::Call(ref fun, ref args) = e.kind; if let ExprKind::Call(ref fun, ref args) = e.kind;
if let ExprKind::Path(QPath::TypeRelative(ref ty, ref method)) = fun.kind; if let ExprKind::Path(QPath::TypeRelative(ref ty, ref method)) = fun.kind;
if let TyKind::Path(QPath::Resolved(None, ty_path)) = ty.kind;
then { then {
if !same_tys(self.cx, self.target.ty(), self.body.expr_ty(e)) { if !same_tys(self.cx, self.target.ty(), self.body.expr_ty(e)) {
return; return;
} }
let ty = hir_ty_to_ty(self.cx.tcx, ty); if match_path(ty_path, &paths::HASHMAP) {
if is_type_diagnostic_item(self.cx, ty, sym!(hashmap_type)) {
if method.ident.name == sym!(new) { if method.ident.name == sym!(new) {
self.suggestions self.suggestions
.insert(e.span, "HashMap::default()".to_string()); .insert(e.span, "HashMap::default()".to_string());
@ -2480,7 +2479,7 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ImplicitHasherConstructorVisitor<'a, 'b, 't
), ),
); );
} }
} else if is_type_diagnostic_item(self.cx, ty, sym!(hashset_type)) { } else if match_path(ty_path, &paths::HASHSET) {
if method.ident.name == sym!(new) { if method.ident.name == sym!(new) {
self.suggestions self.suggestions
.insert(e.span, "HashSet::default()".to_string()); .insert(e.span, "HashSet::default()".to_string());