From a284822e009e1e72443041219c7f3646c822ff89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Fri, 27 Sep 2019 09:47:37 -0700
Subject: [PATCH] fix rebase

---
 src/librustc/hir/map/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index d6e3a675be0..b45d3f03960 100644
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -744,7 +744,7 @@ impl<'hir> Map<'hir> {
         let mut iter = ParentHirIterator::new(id, &self).peekable();
         let mut ignore_tail = false;
         if let Some(entry) = self.find_entry(id) {
-            if let Node::Expr(Expr { node: ExprKind::Ret(_), .. }) = entry.node {
+            if let Node::Expr(Expr { kind: ExprKind::Ret(_), .. }) = entry.node {
                 // When dealing with `return` statements, we don't care about climbing only tail
                 // expressions.
                 ignore_tail = true;