diff options
| author | bors <bors@rust-lang.org> | 2017-05-09 03:36:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-09 03:36:12 +0000 |
| commit | bedd7da3d28d69520f33ac6a585df87ef1373a26 (patch) | |
| tree | 78b0129c76c87b9ef98d7b7f83a77083a073720a /src/libsyntax/parse | |
| parent | f1140a33176a5fb2e91e26ea3ae42a834dd9bfdf (diff) | |
| parent | f21209f442ef29f2d77464d2ba37dcec154fbfe2 (diff) | |
| download | rust-bedd7da3d28d69520f33ac6a585df87ef1373a26.tar.gz rust-bedd7da3d28d69520f33ac6a585df87ef1373a26.zip | |
Auto merge of #41846 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests - Successful merges: #41293, #41520, #41827, #41828, #41833, #41836, #41838, #41842 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 7d2a1b3c4a4..ded1f0b599a 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -504,7 +504,7 @@ impl<'a> StringReader<'a> { self.bump(); // line comments starting with "///" or "//!" are doc-comments - let doc_comment = self.ch_is('/') || self.ch_is('!'); + let doc_comment = (self.ch_is('/') && !self.nextch_is('/')) || self.ch_is('!'); let start_bpos = self.pos - BytePos(2); while !self.is_eof() { |