diff options
| author | David Tolnay <dtolnay@gmail.com> | 2022-01-19 18:36:29 -0800 |
|---|---|---|
| committer | David Tolnay <dtolnay@gmail.com> | 2022-01-19 19:02:56 -0800 |
| commit | 351011ec3f043ff17e53f92a2f05e3e58e8e2bf6 (patch) | |
| tree | 231976345bfc10c6914c4fefdece5750585980a4 | |
| parent | d981c5b354c40a6097c83a72173ae8a5569db2e1 (diff) | |
| download | rust-351011ec3f043ff17e53f92a2f05e3e58e8e2bf6.tar.gz rust-351011ec3f043ff17e53f92a2f05e3e58e8e2bf6.zip | |
Simplify left_total tracking
| -rw-r--r-- | compiler/rustc_ast_pretty/src/pp.rs | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/compiler/rustc_ast_pretty/src/pp.rs b/compiler/rustc_ast_pretty/src/pp.rs index b93463e99fd..583bdc616cb 100644 --- a/compiler/rustc_ast_pretty/src/pp.rs +++ b/compiler/rustc_ast_pretty/src/pp.rs @@ -321,20 +321,14 @@ impl Printer { while left_size >= 0 { let left = self.buf.pop_first().unwrap().token; - let len = match left { - Token::Break(b) => b.blank_space, - Token::String(ref s) => { - let len = s.len() as isize; - assert_eq!(len, left_size); - len - } - _ => 0, - }; + match &left { + 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.left_total += len; - if self.buf.is_empty() { break; } @@ -447,11 +441,7 @@ impl Printer { Token::Begin(b) => self.print_begin(*b, l), Token::End => self.print_end(), Token::Break(b) => self.print_break(*b, l), - Token::String(s) => { - let len = s.len() as isize; - assert_eq!(len, l); - self.print_string(s); - } + Token::String(s) => self.print_string(s), } self.last_printed = Some(token); } |
