@@ -152,10 +152,6 @@ resolve_extern_crate_self_requires_renaming =
152152 `extern crate self;` requires renaming
153153 .suggestion = rename the `self` crate to be able to import it
154154
155- resolve_failed_resolve_unresolve_import = failed to resolve: unresolved import
156-
157- resolve_failed_resolve_unresolve_import_label = unresolved import
158-
159155resolve_forward_declared_generic_param =
160156 generic parameters with a default cannot use forward declared identifiers
161157 .label = defaulted generic parameters cannot be forward declared
@@ -194,8 +190,6 @@ resolve_ident_bound_more_than_once_in_parameter_list =
194190 identifier `{ $identifier } ` is bound more than once in this parameter list
195191 .label = used as parameter more than once
196192
197- resolve_implicit_elided_lifetimes_not_allowed_here = implicit elided lifetime not allowed here
198-
199193resolve_ident_bound_more_than_once_in_same_pattern =
200194 identifier `{ $identifier } ` is bound more than once in the same pattern
201195 .label = used in a pattern more than once
@@ -206,6 +200,8 @@ resolve_ident_imported_here_but_it_is_desc =
206200resolve_ident_in_scope_but_it_is_desc =
207201 `{ $imported_ident } ` is in scope, but it is { $imported_ident_desc }
208202
203+ resolve_implicit_elided_lifetimes_not_allowed_here = implicit elided lifetime not allowed here
204+
209205resolve_imported_crate = `$crate` may not be imported
210206
211207resolve_imported_macro_not_found = imported macro not found
@@ -408,6 +404,10 @@ resolve_trait_impl_duplicate =
408404 .old_span_label = previous definition here
409405 .trait_item_span = item in trait
410406
407+ resolve_trait_impl_mismatch =
408+ item `{ $name } ` is an associated { $kind } , which doesn't match its trait `{ $trait_path } `
409+ .label = does not match trait
410+ .trait_impl_mismatch_label_item = item in trait
411411resolve_try_using_similarly_named_label =
412412 try using similarly named label
413413
@@ -467,10 +467,3 @@ resolve_variable_is_not_bound_in_all_patterns =
467467 variable `{ $name } ` is not bound in all patterns
468468
469469resolve_variable_not_in_all_patterns = variable not in all patterns
470-
471- resolve_you_could_import_this_desc = you could import this { $desc }
472-
473- resolve_trait_impl_mismatch =
474- item `{ $name } ` is an associated { $kind } , which doesn't match its trait `{ $trait_path } `
475- .label = does not match trait
476- .trait_impl_mismatch_label_item = item in trait
0 commit comments