Inline Printer's scan_pop_bottom method

dtolnay · dtolnay · commit ae28ec5a9c09 · 2022-01-18T19:16:33.000-08:00
diff --git a/compiler/rustc_ast_pretty/src/pp.rs b/compiler/rustc_ast_pretty/src/pp.rs
@@ -337,7 +337,7 @@ impl Printer {
     fn check_stream(&mut self) {
         if self.right_total - self.left_total > self.space {
             if Some(&self.left) == self.scan_stack.back() {
-                let scanned = self.scan_pop_bottom();
+                let scanned = self.scan_stack.pop_back().unwrap();
                 self.buf[scanned].size = SIZE_INFINITY;
             }
             self.advance_left();
@@ -347,10 +347,6 @@ impl Printer {
         }
     }
 
-    fn scan_pop_bottom(&mut self) -> usize {
-        self.scan_stack.pop_back().unwrap()
-    }
-
     fn advance_left(&mut self) {
         let mut left_size = self.buf[self.left].size;
 

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ impl Printer {`
`337`	`337`	`fn check_stream(&mut self) {`
`338`	`338`	`if self.right_total - self.left_total > self.space {`
`339`	`339`	`if Some(&self.left) == self.scan_stack.back() {`
`340`		`- let scanned = self.scan_pop_bottom();`
	`340`	`+ let scanned = self.scan_stack.pop_back().unwrap();`
`341`	`341`	`self.buf[scanned].size = SIZE_INFINITY;`
`342`	`342`	`}`
`343`	`343`	`self.advance_left();`
`@@ -347,10 +347,6 @@ impl Printer {`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
`350`		`- fn scan_pop_bottom(&mut self) -> usize {`
`351`		`- self.scan_stack.pop_back().unwrap()`
`352`		`- }`
`353`		`-`
`354`	`350`	`fn advance_left(&mut self) {`
`355`	`351`	`let mut left_size = self.buf[self.left].size;`
`356`	`352`