about summary refs log tree commit diff
path: root/compiler/rustc_infer/src
diff options
context:
space:
mode:
authorNikita Tomashevich <quant3234@gmail.com>2022-09-25 10:55:42 +0300
committerNikita Tomashevich <quant3234@gmail.com>2022-12-28 14:53:47 +0300
commit6c19c08140b7c0c5a9f9f9a434036b460167c87d (patch)
treedd60d93f1f2bac4f125c48e0020f360b77fe16dd /compiler/rustc_infer/src
parent57fdd196aeda1e0fa5829248bd4afb8e6f06d7e5 (diff)
downloadrust-6c19c08140b7c0c5a9f9f9a434036b460167c87d.tar.gz
rust-6c19c08140b7c0c5a9f9f9a434036b460167c87d.zip
More descriptive names for ActualImplExplNotes variants
Diffstat (limited to 'compiler/rustc_infer/src')
-rw-r--r--compiler/rustc_infer/src/errors/mod.rs8
-rw-r--r--compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs4
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_infer/src/errors/mod.rs b/compiler/rustc_infer/src/errors/mod.rs
index 55df63075d2..edd9eca24cb 100644
--- a/compiler/rustc_infer/src/errors/mod.rs
+++ b/compiler/rustc_infer/src/errors/mod.rs
@@ -545,8 +545,8 @@ pub struct ExplicitLifetimeRequired<'a> {
 #[derive(Subdiagnostic)]
 pub enum ActualImplExplNotes {
     // Field names have to be different across all variants
-    #[note(infer::actual_impl_expl_1)]
-    NoteOne {
+    #[note(infer::actual_impl_expl_expected)]
+    Expected {
         leading_ellipsis: bool,
         kind: &'static str,
         ty_or_sig: String,
@@ -555,8 +555,8 @@ pub enum ActualImplExplNotes {
         lifetime_1: usize,
         lifetime_2: usize,
     },
-    #[note(infer::actual_impl_expl_2)]
-    NoteTwo {
+    #[note(infer::actual_impl_expl_but_actually)]
+    ButActually {
         kind_2: &'static str,
         trait_path_2: String,
         has_lifetime: bool,
diff --git a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
index d9fc2ec243f..cf1032f7006 100644
--- a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
@@ -451,7 +451,7 @@ impl<'tcx> NiceRegionError<'_, 'tcx> {
             }
         };
 
-        let note_1 = ActualImplExplNotes::NoteOne {
+        let note_1 = ActualImplExplNotes::Expected {
             leading_ellipsis,
             kind,
             ty_or_sig,
@@ -483,7 +483,7 @@ impl<'tcx> NiceRegionError<'_, 'tcx> {
         let lifetime = actual_has_vid.unwrap_or_default();
 
         let note_2 =
-            ActualImplExplNotes::NoteTwo { kind_2, trait_path_2, ty, has_lifetime, lifetime };
+            ActualImplExplNotes::ButActually { kind_2, trait_path_2, ty, has_lifetime, lifetime };
 
         vec![note_1, note_2]
     }