Skip to content

Commit e91dbc5

Browse files
Rename is_bol -> is_beginning_of_line
Also moves it to pp::Printer from PrintState.
1 parent 39aa9bf commit e91dbc5

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/librustc/hir/print.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@ impl<'a> State<'a> {
187187
}
188188

189189
pub fn space_if_not_bol(&mut self) {
190-
if !self.is_bol() {
190+
if !self.s.is_beginning_of_line() {
191191
self.s.space();
192192
}
193193
}
194194

195195
pub fn break_offset_if_not_bol(&mut self, n: usize, off: isize) {
196-
if !self.is_bol() {
196+
if !self.s.is_beginning_of_line() {
197197
self.s.break_offset(n, off)
198198
} else {
199199
if off != 0 && self.s.last_token().is_hardbreak_tok() {

src/libsyntax/print/pp.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ impl Default for BufEntry {
301301
}
302302

303303
impl Printer {
304-
pub fn last_token(&mut self) -> Token {
304+
pub fn last_token(&self) -> Token {
305305
self.buf[self.right].token.clone()
306306
}
307307

@@ -651,6 +651,10 @@ impl Printer {
651651
self.spaces(SIZE_INFINITY as usize)
652652
}
653653

654+
pub fn is_beginning_of_line(&self) -> bool {
655+
self.last_token().is_eof() || self.last_token().is_hardbreak_tok()
656+
}
657+
654658
pub fn hardbreak_tok_offset(off: isize) -> Token {
655659
Token::Break(BreakToken {offset: off, blank_space: SIZE_INFINITY})
656660
}

src/libsyntax/print/pprust.rs

+4-9
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,8 @@ pub trait PrintState<'a> {
445445

446446
fn pclose(&mut self) { self.writer().word(")") }
447447

448-
// is this the beginning of a line?
449-
fn is_bol(&mut self) -> bool {
450-
self.writer().last_token().is_eof() || self.writer().last_token().is_hardbreak_tok()
451-
}
452-
453448
fn hardbreak_if_not_bol(&mut self) {
454-
if !self.is_bol() {
449+
if !self.writer().is_beginning_of_line() {
455450
self.writer().hardbreak()
456451
}
457452
}
@@ -512,7 +507,7 @@ pub trait PrintState<'a> {
512507
}
513508
}
514509
comments::Trailing => {
515-
if !self.is_bol() {
510+
if !self.writer().is_beginning_of_line() {
516511
self.writer().word(" ");
517512
}
518513
if cmnt.lines.len() == 1 {
@@ -735,7 +730,7 @@ pub trait PrintState<'a> {
735730
}
736731

737732
fn space_if_not_bol(&mut self) {
738-
if !self.is_bol() { self.writer().space(); }
733+
if !self.writer().is_beginning_of_line() { self.writer().space(); }
739734
}
740735

741736
fn nbsp(&mut self) { self.writer().word(" ") }
@@ -793,7 +788,7 @@ impl<'a> State<'a> {
793788

794789
crate fn break_offset_if_not_bol(&mut self, n: usize,
795790
off: isize) {
796-
if !self.is_bol() {
791+
if !self.s.is_beginning_of_line() {
797792
self.s.break_offset(n, off)
798793
} else {
799794
if off != 0 && self.s.last_token().is_hardbreak_tok() {

0 commit comments

Comments
 (0)