squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Remove is_begin/is_end functions from PrintState

Browse source 
These are somewhat ambiguous (beginning/end of what?) so it's better to
inline their one use into the code.
This commit is contained in:
Mark Rousskov 2019-07-07 10:51:18 -04:00
parent 57cf7a2e57
commit 4783d9eaa5
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/libsyntax/print/pprust.rs
View file

@ -445,20 +445,6 @@ pub trait PrintState<'a> {
fn pclose(&mut self) { self.writer().word(")") }
fn is_begin(&mut self) -> bool {
match self.writer().last_token() {
pp::Token::Begin(_) => true,
_ => false,
}
}
fn is_end(&mut self) -> bool {
match self.writer().last_token() {
pp::Token::End => true,
_ => false,
}
}
// is this the beginning of a line?
fn is_bol(&mut self) -> bool {
self.writer().last_token().is_eof() || self.writer().last_token().is_hardbreak_tok()
@ -545,11 +531,13 @@ pub trait PrintState<'a> {
}
comments::BlankLine => {
// We need to do at least one, possibly two hardbreaks.
let is_semi = match self.writer().last_token() {
let twice = match self.writer().last_token() {
pp::Token::String(s, _) => ";" == s,
pp::Token::Begin(_) => true,
pp::Token::End => true,
_ => false
};
if is_semi || self.is_begin() || self.is_end() {
if twice {
self.writer().hardbreak();
}
self.writer().hardbreak();