From 321779979a47cd09ae88a76924c85fd3cde7b269 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Wed, 19 Jun 2019 16:59:25 +0700
Subject: [PATCH] Fix missing field in ExprKind::Yield
Rustup rust-lang/rust#61941
---
clippy_lints/src/loops.rs | 2 +-
clippy_lints/src/utils/author.rs | 2 +-
clippy_lints/src/utils/hir_utils.rs | 2 +-
clippy_lints/src/utils/inspector.rs | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs
index c563fcae366..d8266384191 100644
--- a/clippy_lints/src/loops.rs
+++ b/clippy_lints/src/loops.rs
@@ -736,7 +736,7 @@ fn never_loop_expr(expr: &Expr, main_loop_id: HirId) -> NeverLoopResult {
}
},
ExprKind::Struct(_, _, None)
- | ExprKind::Yield(_)
+ | ExprKind::Yield(_, _)
| ExprKind::Closure(_, _, _, _, _)
| ExprKind::InlineAsm(_, _, _)
| ExprKind::Path(_)
diff --git a/clippy_lints/src/utils/author.rs b/clippy_lints/src/utils/author.rs
index d66e2b5f864..3e3a5c48dab 100644
--- a/clippy_lints/src/utils/author.rs
+++ b/clippy_lints/src/utils/author.rs
@@ -377,7 +377,7 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor {
println!("Closure(ref capture_clause, ref func, _, _, _) = {};", current);
println!(" // unimplemented: `ExprKind::Closure` is not further destructured at the moment");
},
- ExprKind::Yield(ref sub) => {
+ ExprKind::Yield(ref sub, _) => {
let sub_pat = self.next("sub");
println!("Yield(ref sub) = {};", current);
self.current = sub_pat;
diff --git a/clippy_lints/src/utils/hir_utils.rs b/clippy_lints/src/utils/hir_utils.rs
index 7e4f46d92ec..7f58d21a315 100644
--- a/clippy_lints/src/utils/hir_utils.rs
+++ b/clippy_lints/src/utils/hir_utils.rs
@@ -436,7 +436,7 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> {
self.hash_expr(&*j);
}
},
- ExprKind::Box(ref e) | ExprKind::DropTemps(ref e) | ExprKind::Yield(ref e) => {
+ ExprKind::Box(ref e) | ExprKind::DropTemps(ref e) | ExprKind::Yield(ref e, _) => {
self.hash_expr(e);
},
ExprKind::Call(ref fun, ref args) => {
diff --git a/clippy_lints/src/utils/inspector.rs b/clippy_lints/src/utils/inspector.rs
index 633ebb3dd42..f7b865bd2ca 100644
--- a/clippy_lints/src/utils/inspector.rs
+++ b/clippy_lints/src/utils/inspector.rs
@@ -227,7 +227,7 @@ fn print_expr(cx: &LateContext<'_, '_>, expr: &hir::Expr, indent: usize) {
println!("{}Closure", ind);
println!("{}clause: {:?}", ind, clause);
},
- hir::ExprKind::Yield(ref sub) => {
+ hir::ExprKind::Yield(ref sub, _) => {
println!("{}Yield", ind);
print_expr(cx, sub, indent + 1);
},