Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e15c083

Browse files
committedMar 18, 2025·
Replace elided_named_lifetimes with mismatched_elided_lifetime_styles
1 parent a8d6de5 commit e15c083

File tree

59 files changed

+364
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+364
-546
lines changed
 

‎compiler/rustc_hir/src/def.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -845,12 +845,7 @@ pub enum LifetimeRes {
845845
/// late resolution. Those lifetimes will be inferred by typechecking.
846846
Infer,
847847
/// `'static` lifetime.
848-
Static {
849-
/// We do not want to emit `elided_named_lifetimes`
850-
/// when we are inside of a const item or a static,
851-
/// because it would get too annoying.
852-
suppress_elision_warning: bool,
853-
},
848+
Static,
854849
/// Resolution failure.
855850
Error,
856851
/// HACK: This is used to recover the NodeId of an elided lifetime.

‎compiler/rustc_lint/messages.ftl

-5
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,6 @@ lint_duplicate_macro_attribute =
251251
252252
lint_duplicate_matcher_binding = duplicate matcher binding
253253
254-
lint_elided_named_lifetime = elided lifetime has a name
255-
.label_elided = this elided lifetime gets resolved as `{$name}`
256-
.label_named = lifetime `{$name}` declared here
257-
.suggestion = consider specifying it explicitly
258-
259254
lint_enum_intrinsics_mem_discriminant =
260255
the return value of `mem::discriminant` is unspecified when called with a non-enum type
261256
.note = the argument to `discriminant` should be a reference to an enum, but it was passed a reference to a `{$ty_param}`, which is not an enum

0 commit comments

Comments
 (0)
Please sign in to comment.