Skip to content

Commit

Permalink
Remove some needless // gate-test- comments
Browse files Browse the repository at this point in the history
Also, add detection to treat such comments as tidy errors.
We also remove the found_lib_feature code because it
was just repeating the found_feature code. Originally it
was intended to allow for gate-test lines for
lib features, but apparently nobody missed it.
  • Loading branch information
est31 committed May 23, 2017
1 parent 5b13bff commit e860655
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// aux-build:attr_proc_macro.rs
// gate-test-proc_macro
#![feature(use_extern_macros)]

extern crate attr_proc_macro;
Expand All @@ -21,4 +20,4 @@ struct Foo;

fn main() {
let _ = Foo;
}
}
2 changes: 0 additions & 2 deletions src/test/compile-fail/feature-gate-global_asm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// gate-test-global_asm

global_asm!(""); //~ ERROR `global_asm!` is not stable

fn main() {}
29 changes: 16 additions & 13 deletions src/tools/tidy/src/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn check(path: &Path, bad: &mut bool) {
}

let filen_underscore = filename.replace("-","_").replace(".rs","");
test_filen_gate(&filen_underscore, &mut features);
let filename_is_gate_test = test_filen_gate(&filen_underscore, &mut features);

contents.truncate(0);
t!(t!(File::open(&file), &file).read_to_string(&mut contents));
Expand All @@ -92,17 +92,20 @@ pub fn check(path: &Path, bad: &mut bool) {
},
None => continue,
};
let found_feature = features.get_mut(feature_name)
.map(|v| { v.has_gate_test = true; () })
.is_some();

let found_lib_feature = features.get_mut(feature_name)
.map(|v| { v.has_gate_test = true; () })
.is_some();

if !(found_feature || found_lib_feature) {
err(&format!("gate-test test found referencing a nonexistent feature '{}'",
feature_name));
match features.get_mut(feature_name) {
Some(f) => {
if filename_is_gate_test {
err(&format!("The file is already marked as gate test \
through its name, no need for a \
'gate-test-{}' comment",
feature_name));
}
f.has_gate_test = true;
}
None => {
err(&format!("gate-test test found referencing a nonexistent feature '{}'",
feature_name));
}
}
}
});
Expand Down Expand Up @@ -265,4 +268,4 @@ pub fn collect_lib_features(base_src_path: &Path,
}
});
lib_features
}
}

0 comments on commit e860655

Please sign in to comment.