user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a semantic merge conflict

Browse source
This commit is contained in:
Alex Crichton 2017-06-21 11:32:32 -07:00 • committed by Jeffrey Seyfried
parent 71d4a860a1
commit 699078a35b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/tidy/src/features.rs
View file

@ -245,7 +245,7 @@ fn get_and_check_lib_features(base_src_path: &Path,
let mut err = |msg: &str| {
tidy_error!(bad, "{}:{}: {}", file.display(), line, msg);
};
if lang_features.contains_key(name) && feature_name != "proc_macro" {
if lang_features.contains_key(name) && name != "proc_macro" {
err("duplicating a lang feature");
}
if let Some(ref s) = lib_features.get(name) {