bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

More descriptive names for ActualImplExplNotes variants

Browse source
This commit is contained in:
Nikita Tomashevich 2022-09-25 10:55:42 +03:00
parent 57fdd196ae
commit 6c19c08140
No known key found for this signature in database
GPG key ID: B29791D4D878E345
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_infer/src/errors/mod.rs
View file

@ -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,

4
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
View file

@ -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]
}