Auto merge of #59700 - matklad:simplify, r=eddyb

Simplify doc comment lexing

is_doc_comment function checks the first four chars, but this is
redundant, `doc_comment` local var has the same info.
This commit is contained in:
bors 2019-04-20 17:59:15 +00:00
commit 4530c528ba

View File

@ -630,26 +630,14 @@ impl<'a> StringReader<'a> {
self.bump(); self.bump();
} }
if doc_comment { let tok = if doc_comment {
self.with_str_from(start_bpos, |string| { self.with_str_from(start_bpos, |string| {
// comments with only more "/"s are not doc comments
let tok = if is_doc_comment(string) {
token::DocComment(Symbol::intern(string)) token::DocComment(Symbol::intern(string))
})
} else { } else {
token::Comment token::Comment
}; };
Some(TokenAndSpan { tok, sp: self.mk_sp(start_bpos, self.pos) })
Some(TokenAndSpan {
tok,
sp: self.mk_sp(start_bpos, self.pos),
})
})
} else {
Some(TokenAndSpan {
tok: token::Comment,
sp: self.mk_sp(start_bpos, self.pos),
})
}
} }
Some('*') => { Some('*') => {
self.bump(); self.bump();