diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-06-21 11:32:32 -0700 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2017-06-26 02:08:09 +0000 |
| commit | 699078a35be3ec30dfbb88683129a9f2fd4ad415 (patch) | |
| tree | 5de7c30b8347330ae1aa81926caf2441243cc22e /src | |
| parent | 71d4a860a1797300f976b45d7b7a41815eca6207 (diff) | |
| download | rust-699078a35be3ec30dfbb88683129a9f2fd4ad415.tar.gz rust-699078a35be3ec30dfbb88683129a9f2fd4ad415.zip | |
Fix a semantic merge conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/tidy/src/features.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index d98c6932c51..4c94ade98d9 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -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) { |