]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #4911 : lifthrasiir/rust/comment-exemptions, r=catamorphism
authorbors <bors@rust-lang.org>
Fri, 15 Feb 2013 00:34:38 +0000 (16:34 -0800)
committerbors <bors@rust-lang.org>
Fri, 15 Feb 2013 00:34:38 +0000 (16:34 -0800)
This is a natural extension of #4887, and handles the following three cases:

~~~~
a line with only /s
////////////////////////////////////////////

a line with only /s followed by whitespace
////////////////////////////////////////////

a block comment with only *s between two /s
/********************************/
~~~~

1  2 
src/libsyntax/parse/comments.rs
src/libsyntax/parse/lexer.rs

Simple merge
Simple merge