From 699078a35be3ec30dfbb88683129a9f2fd4ad415 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 21 Jun 2017 11:32:32 -0700 Subject: Fix a semantic merge conflict --- src/tools/tidy/src/features.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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) { -- cgit 1.4.1-3-g733a5