diff options
| author | Nathan Stocks <cleancut@github.com> | 2022-09-21 22:30:14 -0600 |
|---|---|---|
| committer | Nathan Stocks <cleancut@github.com> | 2022-10-07 13:19:27 -0600 |
| commit | b8e03cfa55d6133f8fc1fd3a82a7e686a9cf006e (patch) | |
| tree | 5a896488efa8840f1a05ef06e4fc8ab84bca8f01 | |
| parent | c24a87315af884680332f850753b3eeef18c22c8 (diff) | |
| download | rust-b8e03cfa55d6133f8fc1fd3a82a7e686a9cf006e.tar.gz rust-b8e03cfa55d6133f8fc1fd3a82a7e686a9cf006e.zip | |
use consistent names
| -rw-r--r-- | compiler/rustc_passes/src/check_attr.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_passes/src/lang_items.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs index 2a9578e8ce3..18e1233fa84 100644 --- a/compiler/rustc_passes/src/check_attr.rs +++ b/compiler/rustc_passes/src/check_attr.rs @@ -1862,11 +1862,11 @@ impl CheckAttrVisitor<'_> { match std::fs::File::open(&file) { Ok(_) => true, - Err(err) => { + Err(error) => { self.tcx.sess.emit_err(DebugVisualizerUnreadable { span: meta_item.span, file: &file, - error: err, + error, }); false } diff --git a/compiler/rustc_passes/src/lang_items.rs b/compiler/rustc_passes/src/lang_items.rs index 24657372486..2b090e036fe 100644 --- a/compiler/rustc_passes/src/lang_items.rs +++ b/compiler/rustc_passes/src/lang_items.rs @@ -35,8 +35,8 @@ impl<'tcx> LanguageItemCollector<'tcx> { fn check_for_lang(&mut self, actual_target: Target, hir_id: HirId) { let attrs = self.tcx.hir().attrs(hir_id); - if let Some((value, span)) = extract(&attrs) { - match ITEM_REFS.get(&value).cloned() { + if let Some((name, span)) = extract(&attrs) { + match ITEM_REFS.get(&name).cloned() { // Known lang item with attribute on correct target. Some((item_index, expected_target)) if actual_target == expected_target => { self.collect_item_extended(item_index, hir_id, span); @@ -45,14 +45,14 @@ impl<'tcx> LanguageItemCollector<'tcx> { Some((_, expected_target)) => { self.tcx.sess.emit_err(LangItemOnIncorrectTarget { span, - name: value, + name, expected_target, actual_target, }); } // Unknown lang item. _ => { - self.tcx.sess.emit_err(UnknownLangItem { span, name: value }); + self.tcx.sess.emit_err(UnknownLangItem { span, name }); } } } |