Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-10 15:14:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle nested block comments

Browse source
This commit is contained in:
Philipp Hansch 2018-03-30 12:36:30 +02:00
parent bb4af196be
commit db1ec44616
No known key found for this signature in database
GPG key ID: 93FB33459D311E5E
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clippy_lints/src/utils/mod.rs
View file

@ -1101,19 +1101,18 @@ pub fn clip(tcx: TyCtxt, u: u128, ity: ast::UintTy) -> u128 {
pub fn without_block_comments(lines: Vec<&str>) -> Vec<&str> {
let mut without = vec![];
// naive approach for block comments
let mut inside_comment = false;
let mut nest_level = 0;
for line in lines.into_iter() {
if line.contains("/*") {
inside_comment = true;
nest_level += 1;
continue;
} else if line.contains("*/") {
inside_comment = false;
nest_level -= 1;
continue;
}
if !inside_comment {
if nest_level == 0 {
without.push(line);
}
}

7
tests/ui/empty_line_after_outer_attribute.rs
View file

@ -79,11 +79,16 @@ pub enum FooFighter {
Bar4
}
// This should not produce a warning because there is a comment in between
// This should not produce a warning because the empty line is inside a block comment
#[crate_type = "lib"]
/*
*/
pub struct S;
// This should not produce a warning
#[crate_type = "lib"]
/* test */
pub struct T;
fn main() { }

9
tests/without_block_comments.rs
View file

@ -15,6 +15,15 @@ fn test_lines_without_block_comments() {
let result = without_block_comments(vec!["/* rust", "", "*/"]);
assert!(result.is_empty());
let result = without_block_comments(vec!["/* one-line comment */"]);
assert!(result.is_empty());
let result = without_block_comments(vec!["/* nested", "/* multi-line", "comment", "*/", "test", "*/"]);
assert!(result.is_empty());
let result = without_block_comments(vec!["/* nested /* inline /* comment */ test */ */"]);
assert!(result.is_empty());
let result = without_block_comments(vec!["foo", "bar", "baz"]);
assert_eq!(result, vec!["foo", "bar", "baz"]);
}