mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Use Option::unwrap_or instead of open-coding it
This commit is contained in:
Yuki Okushi 2020-10-14 06:02:33 +09:00 • committed by GitHub
commit 31135e02fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_ast_pretty/src/pp.rs
View file

@ -491,12 +491,9 @@ impl Printer {
} }
fn get_top(&mut self) -> PrintStackElem { fn get_top(&mut self) -> PrintStackElem {
match self.print_stack.last() { *self.print_stack.last().unwrap_or({
Some(el) => *el, &PrintStackElem { offset: 0, pbreak: PrintStackBreak::Broken(Breaks::Inconsistent) }
None => { })
PrintStackElem { offset: 0, pbreak: PrintStackBreak::Broken(Breaks::Inconsistent) }
}
}
} }
fn print_begin(&mut self, b: BeginToken, l: isize) { fn print_begin(&mut self, b: BeginToken, l: isize) {