From d2eb46cfecf62210ee313da76acadedd7a2cbfcb Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 19 Jan 2022 18:37:45 -0800 Subject: [PATCH] Simplify advance_left --- compiler/rustc_ast_pretty/src/pp.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/compiler/rustc_ast_pretty/src/pp.rs b/compiler/rustc_ast_pretty/src/pp.rs index 583bdc616cb..2c7962e44d0 100644 --- a/compiler/rustc_ast_pretty/src/pp.rs +++ b/compiler/rustc_ast_pretty/src/pp.rs @@ -316,24 +316,20 @@ impl Printer { } fn advance_left(&mut self) { - let mut left_size = self.buf.first().unwrap().size; + while self.buf.first().unwrap().size >= 0 { + let left = self.buf.pop_first().unwrap(); - while left_size >= 0 { - let left = self.buf.pop_first().unwrap().token; - - match &left { + match &left.token { Token::Break(b) => self.left_total += b.blank_space, Token::String(s) => self.left_total += s.len() as isize, _ => {} } - self.print(left, left_size); + self.print(left.token, left.size); if self.buf.is_empty() { break; } - - left_size = self.buf.first().unwrap().size; } }