about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2019-05-01 22:18:05 +0200
committerMatthias Krüger <matthias.krueger@famsik.de>2019-05-01 22:18:16 +0200
commit24e856f10a6e7b623fb1e1674bb158bbb339b881 (patch)
tree484176f5de88b7bb3517473a57379b6c3bfc00b1
parent990d6833b24d585035ca42dbc25e990ce589917b (diff)
downloadrust-24e856f10a6e7b623fb1e1674bb158bbb339b881.tar.gz
rust-24e856f10a6e7b623fb1e1674bb158bbb339b881.zip
rustup https://github.com/rust-lang/rust/pull/60417/
cc https://github.com/rust-lang/rust/issues/60448
-rw-r--r--clippy_lints/src/loops.rs2
-rw-r--r--clippy_lints/src/utils/author.rs2
-rw-r--r--clippy_lints/src/utils/hir_utils.rs6
-rw-r--r--clippy_lints/src/utils/inspector.rs2
-rw-r--r--clippy_lints/src/utils/sugg.rs2
5 files changed, 7 insertions, 7 deletions
diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs
index 1f6501f74e7..d82be14e40c 100644
--- a/clippy_lints/src/loops.rs
+++ b/clippy_lints/src/loops.rs
@@ -677,7 +677,7 @@ fn never_loop_expr(expr: &Expr, main_loop_id: HirId) -> NeverLoopResult {
         | ExprKind::AddrOf(_, ref e)
         | ExprKind::Struct(_, _, Some(ref e))
         | ExprKind::Repeat(ref e, _)
-        | ExprKind::Use(ref e) => never_loop_expr(e, main_loop_id),
+        | ExprKind::DropTemps(ref e) => never_loop_expr(e, main_loop_id),
         ExprKind::Array(ref es) | ExprKind::MethodCall(_, _, ref es) | ExprKind::Tup(ref es) => {
             never_loop_expr_all(&mut es.iter(), main_loop_id)
         },
diff --git a/clippy_lints/src/utils/author.rs b/clippy_lints/src/utils/author.rs
index 3936473f725..729b2202d80 100644
--- a/clippy_lints/src/utils/author.rs
+++ b/clippy_lints/src/utils/author.rs
@@ -495,7 +495,7 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor {
             ExprKind::Err => {
                 println!("Err = {}", current);
             },
-            ExprKind::Use(ref expr) => {
+            ExprKind::DropTemps(ref expr) => {
                 let expr_pat = self.next("expr");
                 println!("Use(ref {}) = {};", expr_pat, current);
                 self.current = expr_pat;
diff --git a/clippy_lints/src/utils/hir_utils.rs b/clippy_lints/src/utils/hir_utils.rs
index 71f84d6910f..d915e8fdedd 100644
--- a/clippy_lints/src/utils/hir_utils.rs
+++ b/clippy_lints/src/utils/hir_utils.rs
@@ -156,7 +156,7 @@ impl<'a, 'tcx: 'a> SpanlessEq<'a, 'tcx> {
                     && self.eq_block(lb, rb)
                     && both(ll, rl, |l, r| l.ident.as_str() == r.ident.as_str())
             },
-            (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
+            (&ExprKind::DropTemps(ref le), &ExprKind::DropTemps(ref re)) => self.eq_expr(le, re),
             _ => false,
         }
     }
@@ -607,8 +607,8 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> {
                 }
             },
             ExprKind::Err => {},
-            ExprKind::Use(ref e) => {
-                let c: fn(_) -> _ = ExprKind::Use;
+            ExprKind::DropTemps(ref e) => {
+                let c: fn(_) -> _ = ExprKind::DropTemps;
                 c.hash(&mut self.s);
                 self.hash_expr(e);
             },
diff --git a/clippy_lints/src/utils/inspector.rs b/clippy_lints/src/utils/inspector.rs
index 02725e51060..6cd595607d3 100644
--- a/clippy_lints/src/utils/inspector.rs
+++ b/clippy_lints/src/utils/inspector.rs
@@ -330,7 +330,7 @@ fn print_expr(cx: &LateContext<'_, '_>, expr: &hir::Expr, indent: usize) {
         hir::ExprKind::Err => {
             println!("{}Err", ind);
         },
-        hir::ExprKind::Use(ref e) => {
+        hir::ExprKind::DropTemps(ref e) => {
             println!("{}Use", ind);
             print_expr(cx, e, indent + 1);
         },
diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs
index acb996a3c9b..3fa08e0a11c 100644
--- a/clippy_lints/src/utils/sugg.rs
+++ b/clippy_lints/src/utils/sugg.rs
@@ -115,7 +115,7 @@ impl<'a> Sugg<'a> {
             | hir::ExprKind::Struct(..)
             | hir::ExprKind::Tup(..)
             | hir::ExprKind::While(..)
-            | hir::ExprKind::Use(_)
+            | hir::ExprKind::DropTemps(_)
             | hir::ExprKind::Err => Sugg::NonParen(snippet),
             hir::ExprKind::Assign(..) => Sugg::BinOp(AssocOp::Assign, snippet),
             hir::ExprKind::AssignOp(op, ..) => Sugg::BinOp(hirbinop2assignop(op), snippet),