Fix a semantic merge conflict

alexcrichton · jseyfried · commit 699078a35be3 · 2017-06-26T02:08:09.000Z
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ fn get_and_check_lib_features(base_src_path: &Path,`
`245`	`245`	`let mut err = \|msg: &str\| {`
`246`	`246`	`tidy_error!(bad, "{}:{}: {}", file.display(), line, msg);`
`247`	`247`	`};`
`248`		`- if lang_features.contains_key(name) && feature_name != "proc_macro" {`
	`248`	`+ if lang_features.contains_key(name) && name != "proc_macro" {`
`249`	`249`	`err("duplicating a lang feature");`
`250`	`250`	`}`
`251`	`251`	`if let Some(ref s) = lib_features.get(name) {`