Rollup merge of #77884 - LingMan:ast_pretty_unwrap_or, r=varkor

JohnTitor · web-flow · commit 31135e02fac0 · 2020-10-14T06:02:33.000+09:00
Use Option::unwrap_or instead of open-coding it
diff --git a/compiler/rustc_ast_pretty/src/pp.rs b/compiler/rustc_ast_pretty/src/pp.rs
@@ -491,12 +491,9 @@ impl Printer {
     }
 
     fn get_top(&mut self) -> PrintStackElem {
-        match self.print_stack.last() {
-            Some(el) => *el,
-            None => {
-                PrintStackElem { offset: 0, pbreak: PrintStackBreak::Broken(Breaks::Inconsistent) }
-            }
-        }
+        *self.print_stack.last().unwrap_or({
+            &PrintStackElem { offset: 0, pbreak: PrintStackBreak::Broken(Breaks::Inconsistent) }
+        })
     }
 
     fn print_begin(&mut self, b: BeginToken, l: isize) {

Original file line number	Diff line number	Diff line change
`@@ -491,12 +491,9 @@ impl Printer {`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`fn get_top(&mut self) -> PrintStackElem {`
`494`		`- match self.print_stack.last() {`
`495`		`- Some(el) => *el,`
`496`		`- None => {`
`497`		`- PrintStackElem { offset: 0, pbreak: PrintStackBreak::Broken(Breaks::Inconsistent) }`
`498`		`- }`
`499`		`- }`
	`494`	`+ *self.print_stack.last().unwrap_or({`
	`495`	`+ &PrintStackElem { offset: 0, pbreak: PrintStackBreak::Broken(Breaks::Inconsistent) }`
	`496`	`+ })`
`500`	`497`	`}`
`501`	`498`
`502`	`499`	`fn print_begin(&mut self, b: BeginToken, l: isize) {`