Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-21 17:52:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move BufEntry assignment into scan_push

Browse Source
This commit is contained in:
Mark Rousskov
2019-07-06 07:28:25 -04:00
parent ccf279d9c3
commit cd2d8326a5
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsyntax/print/pp.rs
+7 -12
View File
@@ -328,9 +328,7 @@ fn pretty_print_begin(&mut self, b: BeginToken) {
}
debug!("pp Begin({})/buffer Vec<{},{}>",
b.offset, self.left, self.right);
self.buf[self.right] = BufEntry { token: Token::Begin(b), size: -self.right_total };
let right = self.right;
self.scan_push(right);
self.scan_push(BufEntry { token: Token::Begin(b), size: -self.right_total });
}
fn pretty_print_end(&mut self) {
@@ -340,9 +338,7 @@ fn pretty_print_end(&mut self) {
} else {
debug!("pp End/buffer Vec<{},{}>", self.left, self.right);
self.advance_right();
self.buf[self.right] = BufEntry { token: Token::End, size: -1 };
let right = self.right;
self.scan_push(right);
self.scan_push(BufEntry { token: Token::End, size: -1 });
}
}
@@ -358,9 +354,7 @@ fn pretty_print_break(&mut self, b: BreakToken) {
debug!("pp Break({})/buffer Vec<{},{}>",
b.offset, self.left, self.right);
self.check_stack(0);
let right = self.right;
self.scan_push(right);
self.buf[self.right] = BufEntry { token: Token::Break(b), size: -self.right_total };
self.scan_push(BufEntry { token: Token::Break(b), size: -self.right_total });
self.right_total += b.blank_space;
}
@@ -397,9 +391,10 @@ fn check_stream(&mut self) {
}
}
fn scan_push(&mut self, x: usize) {
debug!("scan_push {}", x);
self.scan_stack.push_front(x);
fn scan_push(&mut self, entry: BufEntry) {
debug!("scan_push {}", self.right);
self.buf[self.right] = entry;
self.scan_stack.push_front(self.right);
}
fn scan_pop(&mut self) -> usize {