diff options
| author | bors <bors@rust-lang.org> | 2019-04-20 17:59:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-20 17:59:15 +0000 |
| commit | 4530c528ba4eadd7623813316d75bd4b97012b6c (patch) | |
| tree | da5f4040447b5e0549ed922828d2320c06575a97 /src/libsyntax/parse | |
| parent | 72bc62047f7fd9219bcd884d399c98463f2978ae (diff) | |
| parent | 606e0aff81e96df953b1d6dba5aae3555365809e (diff) | |
| download | rust-4530c528ba4eadd7623813316d75bd4b97012b6c.tar.gz rust-4530c528ba4eadd7623813316d75bd4b97012b6c.zip | |
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.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 3b980fafc2f..aad2acfd6d4 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -630,26 +630,14 @@ impl<'a> StringReader<'a> { self.bump(); } - if doc_comment { + let tok = if doc_comment { 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)) - } else { - token::Comment - }; - - Some(TokenAndSpan { - tok, - sp: self.mk_sp(start_bpos, self.pos), - }) + token::DocComment(Symbol::intern(string)) }) } else { - Some(TokenAndSpan { - tok: token::Comment, - sp: self.mk_sp(start_bpos, self.pos), - }) - } + token::Comment + }; + Some(TokenAndSpan { tok, sp: self.mk_sp(start_bpos, self.pos) }) } Some('*') => { self.bump(); |
