bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Inline Printer's scan_pop method

Browse source
This commit is contained in:
David Tolnay 2022-01-18 19:15:02 -08:00
parent 50d722a691
commit e20d5abdfb
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -347,10 +347,6 @@ impl Printer {
} }
} }
fn scan_pop(&mut self) -> usize {
self.scan_stack.pop_front().unwrap()
}
fn scan_top(&self) -> usize { fn scan_top(&self) -> usize {
*self.scan_stack.front().unwrap() *self.scan_stack.front().unwrap()
} }
@ -396,19 +392,19 @@ impl Printer {
match self.buf[x].token { match self.buf[x].token {
Token::Begin(_) => { Token::Begin(_) => {
if k > 0 { if k > 0 {
self.scan_pop(); self.scan_stack.pop_front().unwrap();
self.buf[x].size += self.right_total; self.buf[x].size += self.right_total;
self.check_stack(k - 1); self.check_stack(k - 1);
} }
} }
Token::End => { Token::End => {
// paper says + not =, but that makes no sense. // paper says + not =, but that makes no sense.
self.scan_pop(); self.scan_stack.pop_front().unwrap();
self.buf[x].size = 1; self.buf[x].size = 1;
self.check_stack(k + 1); self.check_stack(k + 1);
} }
_ => { _ => {
self.scan_pop(); self.scan_stack.pop_front().unwrap();
self.buf[x].size += self.right_total; self.buf[x].size += self.right_total;
if k > 0 { if k > 0 {
self.check_stack(k); self.check_stack(k);