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

Use Option::unwrap_or instead of open-coding it
JohnTitor · Oct 13, 2020 · 4f70e26 · 4f70e26
2 parents 71340d5 + 61e722f
commit 4f70e26
Showing 1 changed file with 3 additions and 6 deletions.
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) {