Rollup merge of #80923 - LingMan:exits, r=varkor

JohnTitor · web-flow · commit 4e69c5d0fad5 · 2021-01-12T07:59:18.000+09:00
Merge different function exits

`@rustbot` modify labels +C-cleanup +T-compiler
diff --git a/compiler/rustc_middle/src/hir/map/mod.rs b/compiler/rustc_middle/src/hir/map/mod.rs
@@ -710,15 +710,10 @@ impl<'hir> Map<'hir> {
         let mut scope = id;
         loop {
             scope = self.get_enclosing_scope(scope).unwrap_or(CRATE_HIR_ID);
-            if scope == CRATE_HIR_ID {
-                return CRATE_HIR_ID;
-            }
-            match self.get(scope) {
-                Node::Block(_) => {}
-                _ => break,
+            if scope == CRATE_HIR_ID || !matches!(self.get(scope), Node::Block(_)) {
+                return scope;
             }
         }
-        scope
     }
 
     pub fn get_parent_did(&self, id: HirId) -> LocalDefId {

Original file line number	Diff line number	Diff line change
`@@ -710,15 +710,10 @@ impl<'hir> Map<'hir> {`
`710`	`710`	`let mut scope = id;`
`711`	`711`	`loop {`
`712`	`712`	`scope = self.get_enclosing_scope(scope).unwrap_or(CRATE_HIR_ID);`
`713`		`- if scope == CRATE_HIR_ID {`
`714`		`- return CRATE_HIR_ID;`
`715`		`- }`
`716`		`- match self.get(scope) {`
`717`		`- Node::Block(_) => {}`
`718`		`- _ => break,`
	`713`	`+ if scope == CRATE_HIR_ID \|\| !matches!(self.get(scope), Node::Block(_)) {`
	`714`	`+ return scope;`
`719`	`715`	`}`
`720`	`716`	`}`
`721`		`- scope`
`722`	`717`	`}`
`723`	`718`
`724`	`719`	`pub fn get_parent_did(&self, id: HirId) -> LocalDefId {`