Skip to content

Commit ed33a8b

Browse files
committed
---
yaml --- r: 210847 b: refs/heads/try c: 2dcc200 h: refs/heads/master i: 210845: 0df3ea9 210843: 256f19f 210839: ac42c25 210831: 8c02b40 210815: a3bb327 v: v3
1 parent 757ef39 commit ed33a8b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 93af5f9b446adfeb95abdd8df76cf961451f9d91
5+
refs/heads/try: 2dcc200be0f17ec0cab568736d9d3ccbae453a65
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libsyntax/parse/lexer/mod.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,11 @@ impl<'a> StringReader<'a> {
406406

407407
// line comments starting with "///" or "//!" are doc-comments
408408
let doc_comment = self.curr_is('/') || self.curr_is('!');
409+
let start_bpos = if doc_comment {
410+
self.pos - BytePos(3)
411+
} else {
412+
self.last_pos - BytePos(2)
413+
};
409414

410415
while !self.is_eof() {
411416
match self.curr.unwrap() {
@@ -425,7 +430,6 @@ impl<'a> StringReader<'a> {
425430
}
426431

427432
return if doc_comment {
428-
let start_bpos = self.pos - BytePos(3);
429433
self.with_str_from(start_bpos, |string| {
430434
// comments with only more "/"s are not doc comments
431435
let tok = if is_doc_comment(string) {
@@ -440,7 +444,6 @@ impl<'a> StringReader<'a> {
440444
})
441445
})
442446
} else {
443-
let start_bpos = self.last_pos - BytePos(2);
444447
Some(TokenAndSpan {
445448
tok: token::Comment,
446449
sp: codemap::mk_sp(start_bpos, self.last_pos)

0 commit comments

Comments
 (0)