mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename subdiagnostic fields that do not need to be unique now

Browse source
This commit is contained in:
Nikita Tomashevich 2022-10-15 13:16:51 +03:00
parent eb7ce1703b
commit 40b221814e
No known key found for this signature in database
GPG key ID: B29791D4D878E345
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_error_messages/locales/en-US/infer.ftl
View file

@ -233,15 +233,15 @@ infer_actual_impl_expl_expected_other_nothing = {$leading_ellipsis ->
*[false] {""}
}`{$ty_or_sig}` must implement `{$trait_path}`
infer_actual_impl_expl_but_actually_implements_trait = ...but it actually implements `{$trait_path_2}`{$has_lifetime ->
infer_actual_impl_expl_but_actually_implements_trait = ...but it actually implements `{$trait_path}`{$has_lifetime ->
[true] , for some specific lifetime `'{$lifetime}`
*[false] {""}
}
infer_actual_impl_expl_but_actually_implemented_for_ty = ...but `{$trait_path_2}` is actually implemented for the type `{$ty}`{$has_lifetime ->
infer_actual_impl_expl_but_actually_implemented_for_ty = ...but `{$trait_path}` is actually implemented for the type `{$ty}`{$has_lifetime ->
[true] , for some specific lifetime `'{$lifetime}`
*[false] {""}
}
infer_actual_impl_expl_but_actually_ty_implements = ...but `{$ty}` actually implements `{$trait_path_2}`{$has_lifetime ->
infer_actual_impl_expl_but_actually_ty_implements = ...but `{$ty}` actually implements `{$trait_path}`{$has_lifetime ->
[true] , for some specific lifetime `'{$lifetime}`
*[false] {""}
}

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

@ -617,21 +617,16 @@ pub enum ActualImplExplNotes {
#[note(infer::actual_impl_expl_expected_other_nothing)]
ExpectedOtherNothing { leading_ellipsis: bool, ty_or_sig: String, trait_path: String },
#[note(infer::actual_impl_expl_but_actually_implements_trait)]
ButActuallyImplementsTrait { trait_path_2: String, has_lifetime: bool, lifetime: usize },
ButActuallyImplementsTrait { trait_path: String, has_lifetime: bool, lifetime: usize },
#[note(infer::actual_impl_expl_but_actually_implemented_for_ty)]
ButActuallyImplementedForTy {
trait_path_2: String,
trait_path: String,
has_lifetime: bool,
lifetime: usize,
ty: String,
},
#[note(infer::actual_impl_expl_but_actually_ty_implements)]
ButActuallyTyImplements {
trait_path_2: String,
has_lifetime: bool,
lifetime: usize,
ty: String,
},
ButActuallyTyImplements { trait_path: String, has_lifetime: bool, lifetime: usize, ty: String },
}
pub enum ActualImplExpectedKind {

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

@ -474,27 +474,22 @@ impl<'tcx> NiceRegionError<'_, 'tcx> {
None => true,
};
let trait_path_2 = actual_trait_ref.map(|tr| tr.print_only_trait_path()).to_string();
let trait_path = actual_trait_ref.map(|tr| tr.print_only_trait_path()).to_string();
let ty = actual_trait_ref.map(|tr| tr.self_ty()).to_string();
let has_lifetime = actual_has_vid.is_some();
let lifetime = actual_has_vid.unwrap_or_default();
let note_2 = if same_self_type {
ActualImplExplNotes::ButActuallyImplementsTrait { trait_path_2, has_lifetime, lifetime }
ActualImplExplNotes::ButActuallyImplementsTrait { trait_path, has_lifetime, lifetime }
} else if passive_voice {
ActualImplExplNotes::ButActuallyImplementedForTy {
trait_path_2,
trait_path,
ty,
has_lifetime,
lifetime,
}
} else {
ActualImplExplNotes::ButActuallyTyImplements {
trait_path_2,
ty,
has_lifetime,
lifetime,
}
ActualImplExplNotes::ButActuallyTyImplements { trait_path, ty, has_lifetime, lifetime }
};
vec![note_1, note_2]