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 76938d6

Browse files
borsbors
committedDec 1, 2021
Auto merge of #90446 - cjgillot:late-elided, r=jackh726
Lint elided lifetimes in path during lifetime resolution. The lifetime elision lint is known to be brittle and can be redundant with later lifetime resolution errors. This PR aims to remove the redundancy by performing the lint after lifetime resolution. This PR proposes to carry the information that an elision should be linted against by using a special `LifetimeName`. I am not certain this is the best solution, but it is certainly the easiest. Fixes #60199 Fixes #55768 Fixes #63110 Fixes #71957
2 parents 48a5999 + aa2450f commit 76938d6

File tree

13 files changed

+399
-239
lines changed

13 files changed

+399
-239
lines changed
 

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,7 +1786,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
17861786
GenericArg::Lifetime(hir::Lifetime {
17871787
hir_id: self.next_id(),
17881788
span: self.lower_span(span),
1789-
name: hir::LifetimeName::Implicit,
1789+
name: hir::LifetimeName::Implicit(false),
17901790
})));
17911791
let generic_args = self.arena.alloc_from_iter(generic_args);
17921792

@@ -1927,7 +1927,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
19271927
});
19281928
let param_name = match lt.name {
19291929
hir::LifetimeName::Param(param_name) => param_name,
1930-
hir::LifetimeName::Implicit
1930+
hir::LifetimeName::Implicit(_)
19311931
| hir::LifetimeName::Underscore
19321932
| hir::LifetimeName::Static => hir::ParamName::Plain(lt.name.ident()),
19331933
hir::LifetimeName::ImplicitObjectLifetimeDefault => {
@@ -2290,7 +2290,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
22902290

22912291
AnonymousLifetimeMode::ReportError => self.new_error_lifetime(None, span),
22922292

2293-
AnonymousLifetimeMode::PassThrough => self.new_implicit_lifetime(span),
2293+
AnonymousLifetimeMode::PassThrough => self.new_implicit_lifetime(span, false),
22942294
}
22952295
}
22962296

@@ -2322,11 +2322,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23222322
&'s mut self,
23232323
span: Span,
23242324
count: usize,
2325+
param_mode: ParamMode,
23252326
) -> impl Iterator<Item = hir::Lifetime> + Captures<'a> + Captures<'s> + Captures<'hir> {
2326-
(0..count).map(move |_| self.elided_path_lifetime(span))
2327+
(0..count).map(move |_| self.elided_path_lifetime(span, param_mode))
23272328
}
23282329

2329-
fn elided_path_lifetime(&mut self, span: Span) -> hir::Lifetime {
2330+
fn elided_path_lifetime(&mut self, span: Span, param_mode: ParamMode) -> hir::Lifetime {
23302331
match self.anonymous_lifetime_mode {
23312332
AnonymousLifetimeMode::CreateParameter => {
23322333
// We should have emitted E0726 when processing this path above
@@ -2342,7 +2343,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23422343
// lifetime. Instead, we simply create an implicit lifetime, which will be checked
23432344
// later, at which point a suitable error will be emitted.
23442345
AnonymousLifetimeMode::PassThrough | AnonymousLifetimeMode::ReportError => {
2345-
self.new_implicit_lifetime(span)
2346+
self.new_implicit_lifetime(span, param_mode == ParamMode::Explicit)
23462347
}
23472348
}
23482349
}
@@ -2385,11 +2386,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23852386
r
23862387
}
23872388

2388-
fn new_implicit_lifetime(&mut self, span: Span) -> hir::Lifetime {
2389+
fn new_implicit_lifetime(&mut self, span: Span, missing: bool) -> hir::Lifetime {
23892390
hir::Lifetime {
23902391
hir_id: self.next_id(),
23912392
span: self.lower_span(span),
2392-
name: hir::LifetimeName::Implicit,
2393+
name: hir::LifetimeName::Implicit(missing),
23932394
}
23942395
}
23952396

@@ -2536,7 +2537,7 @@ fn lifetimes_from_impl_trait_bounds(
25362537

25372538
fn visit_lifetime(&mut self, lifetime: &'v hir::Lifetime) {
25382539
let name = match lifetime.name {
2539-
hir::LifetimeName::Implicit | hir::LifetimeName::Underscore => {
2540+
hir::LifetimeName::Implicit(_) | hir::LifetimeName::Underscore => {
25402541
if self.collect_elided_lifetimes {
25412542
// Use `'_` for both implicit and underscore lifetimes in
25422543
// `type Foo<'_> = impl SomeTrait<'_>;`.

‎compiler/rustc_ast_lowering/src/path.rs

Lines changed: 33 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ use rustc_hir as hir;
77
use rustc_hir::def::{DefKind, PartialRes, Res};
88
use rustc_hir::def_id::DefId;
99
use rustc_hir::GenericArg;
10-
use rustc_session::lint::builtin::ELIDED_LIFETIMES_IN_PATHS;
11-
use rustc_session::lint::BuiltinLintDiagnostics;
1210
use rustc_span::symbol::Ident;
1311
use rustc_span::{BytePos, Span, DUMMY_SP};
1412

@@ -270,12 +268,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
270268

271269
let has_lifetimes =
272270
generic_args.args.iter().any(|arg| matches!(arg, GenericArg::Lifetime(_)));
273-
if !generic_args.parenthesized && !has_lifetimes {
271+
if !generic_args.parenthesized && !has_lifetimes && expected_lifetimes > 0 {
274272
// Note: these spans are used for diagnostics when they can't be inferred.
275273
// See rustc_resolve::late::lifetimes::LifetimeContext::add_missing_lifetime_specifiers_label
276274
let elided_lifetime_span = if generic_args.span.is_empty() {
277275
// If there are no brackets, use the identifier span.
278-
segment.ident.span
276+
path_span
279277
} else if generic_args.is_empty() {
280278
// If there are brackets, but not generic arguments, then use the opening bracket
281279
generic_args.span.with_hi(generic_args.span.lo() + BytePos(1))
@@ -284,67 +282,47 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
284282
generic_args.span.with_lo(generic_args.span.lo() + BytePos(1)).shrink_to_lo()
285283
};
286284
generic_args.args = self
287-
.elided_path_lifetimes(elided_lifetime_span, expected_lifetimes)
285+
.elided_path_lifetimes(elided_lifetime_span, expected_lifetimes, param_mode)
288286
.map(GenericArg::Lifetime)
289287
.chain(generic_args.args.into_iter())
290288
.collect();
291-
if expected_lifetimes > 0 && param_mode == ParamMode::Explicit {
289+
// In create-parameter mode we error here because we don't want to support
290+
// deprecated impl elision in new features like impl elision and `async fn`,
291+
// both of which work using the `CreateParameter` mode:
292+
//
293+
// impl Foo for std::cell::Ref<u32> // note lack of '_
294+
// async fn foo(_: std::cell::Ref<u32>) { ... }
295+
if let (ParamMode::Explicit, AnonymousLifetimeMode::CreateParameter) =
296+
(param_mode, self.anonymous_lifetime_mode)
297+
{
292298
let anon_lt_suggestion = vec!["'_"; expected_lifetimes].join(", ");
293299
let no_non_lt_args = generic_args.args.len() == expected_lifetimes;
294300
let no_bindings = generic_args.bindings.is_empty();
295-
let (incl_angl_brckt, insertion_sp, suggestion) = if no_non_lt_args && no_bindings {
301+
let (incl_angl_brckt, suggestion) = if no_non_lt_args && no_bindings {
296302
// If there are no generic args, our suggestion can include the angle brackets.
297-
(true, path_span.shrink_to_hi(), format!("<{}>", anon_lt_suggestion))
303+
(true, format!("<{}>", anon_lt_suggestion))
298304
} else {
299305
// Otherwise we'll insert a `'_, ` right after the opening bracket.
300-
let span = generic_args
301-
.span
302-
.with_lo(generic_args.span.lo() + BytePos(1))
303-
.shrink_to_lo();
304-
(false, span, format!("{}, ", anon_lt_suggestion))
306+
(false, format!("{}, ", anon_lt_suggestion))
305307
};
306-
match self.anonymous_lifetime_mode {
307-
// In create-parameter mode we error here because we don't want to support
308-
// deprecated impl elision in new features like impl elision and `async fn`,
309-
// both of which work using the `CreateParameter` mode:
310-
//
311-
// impl Foo for std::cell::Ref<u32> // note lack of '_
312-
// async fn foo(_: std::cell::Ref<u32>) { ... }
313-
AnonymousLifetimeMode::CreateParameter => {
314-
let mut err = struct_span_err!(
315-
self.sess,
316-
path_span,
317-
E0726,
318-
"implicit elided lifetime not allowed here"
319-
);
320-
rustc_errors::add_elided_lifetime_in_path_suggestion(
321-
&self.sess.source_map(),
322-
&mut err,
323-
expected_lifetimes,
324-
path_span,
325-
incl_angl_brckt,
326-
insertion_sp,
327-
suggestion,
328-
);
329-
err.note("assuming a `'static` lifetime...");
330-
err.emit();
331-
}
332-
AnonymousLifetimeMode::PassThrough | AnonymousLifetimeMode::ReportError => {
333-
self.resolver.lint_buffer().buffer_lint_with_diagnostic(
334-
ELIDED_LIFETIMES_IN_PATHS,
335-
CRATE_NODE_ID,
336-
path_span,
337-
"hidden lifetime parameters in types are deprecated",
338-
BuiltinLintDiagnostics::ElidedLifetimesInPaths(
339-
expected_lifetimes,
340-
path_span,
341-
incl_angl_brckt,
342-
insertion_sp,
343-
suggestion,
344-
),
345-
);
346-
}
347-
}
308+
let insertion_sp = elided_lifetime_span.shrink_to_hi();
309+
let mut err = struct_span_err!(
310+
self.sess,
311+
path_span,
312+
E0726,
313+
"implicit elided lifetime not allowed here"
314+
);
315+
rustc_errors::add_elided_lifetime_in_path_suggestion(
316+
&self.sess.source_map(),
317+
&mut err,
318+
expected_lifetimes,
319+
path_span,
320+
incl_angl_brckt,
321+
insertion_sp,
322+
suggestion,
323+
);
324+
err.note("assuming a `'static` lifetime...");
325+
err.emit();
348326
}
349327
}
350328

‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
584584
Some(RegionNameHighlight::MatchedAdtAndSegment(lifetime_span))
585585
}
586586

587-
hir::LifetimeName::ImplicitObjectLifetimeDefault | hir::LifetimeName::Implicit => {
587+
hir::LifetimeName::ImplicitObjectLifetimeDefault | hir::LifetimeName::Implicit(_) => {
588588
// In this case, the user left off the lifetime; so
589589
// they wrote something like:
590590
//

‎compiler/rustc_hir/src/hir.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ pub enum LifetimeName {
9292
Param(ParamName),
9393

9494
/// User wrote nothing (e.g., the lifetime in `&u32`).
95-
Implicit,
95+
///
96+
/// The bool indicates whether the user should have written something.
97+
Implicit(bool),
9698

9799
/// Implicit lifetime in a context like `dyn Foo`. This is
98100
/// distinguished from implicit lifetimes elsewhere because the
@@ -122,7 +124,7 @@ impl LifetimeName {
122124
pub fn ident(&self) -> Ident {
123125
match *self {
124126
LifetimeName::ImplicitObjectLifetimeDefault
125-
| LifetimeName::Implicit
127+
| LifetimeName::Implicit(_)
126128
| LifetimeName::Error => Ident::empty(),
127129
LifetimeName::Underscore => Ident::with_dummy_span(kw::UnderscoreLifetime),
128130
LifetimeName::Static => Ident::with_dummy_span(kw::StaticLifetime),
@@ -133,7 +135,7 @@ impl LifetimeName {
133135
pub fn is_elided(&self) -> bool {
134136
match self {
135137
LifetimeName::ImplicitObjectLifetimeDefault
136-
| LifetimeName::Implicit
138+
| LifetimeName::Implicit(_)
137139
| LifetimeName::Underscore => true,
138140

139141
// It might seem surprising that `Fresh(_)` counts as
@@ -3298,7 +3300,7 @@ mod size_asserts {
32983300
rustc_data_structures::static_assert_size!(super::Expr<'static>, 64);
32993301
rustc_data_structures::static_assert_size!(super::Pat<'static>, 88);
33003302
rustc_data_structures::static_assert_size!(super::QPath<'static>, 24);
3301-
rustc_data_structures::static_assert_size!(super::Ty<'static>, 72);
3303+
rustc_data_structures::static_assert_size!(super::Ty<'static>, 80);
33023304

33033305
rustc_data_structures::static_assert_size!(super::Item<'static>, 184);
33043306
rustc_data_structures::static_assert_size!(super::TraitItem<'static>, 128);

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ pub fn walk_lifetime<'v, V: Visitor<'v>>(visitor: &mut V, lifetime: &'v Lifetime
545545
| LifetimeName::Param(ParamName::Error)
546546
| LifetimeName::Static
547547
| LifetimeName::Error
548-
| LifetimeName::Implicit
548+
| LifetimeName::Implicit(_)
549549
| LifetimeName::ImplicitObjectLifetimeDefault
550550
| LifetimeName::Underscore => {}
551551
}

‎compiler/rustc_resolve/src/late/diagnostics.rs

Lines changed: 114 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1871,6 +1871,117 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
18711871
err.emit();
18721872
}
18731873

1874+
/// Returns whether to add `'static` lifetime to the suggested lifetime list.
1875+
crate fn report_elision_failure(
1876+
&mut self,
1877+
db: &mut DiagnosticBuilder<'_>,
1878+
params: &[ElisionFailureInfo],
1879+
) -> bool {
1880+
let mut m = String::new();
1881+
let len = params.len();
1882+
1883+
let elided_params: Vec<_> =
1884+
params.iter().cloned().filter(|info| info.lifetime_count > 0).collect();
1885+
1886+
let elided_len = elided_params.len();
1887+
1888+
for (i, info) in elided_params.into_iter().enumerate() {
1889+
let ElisionFailureInfo { parent, index, lifetime_count: n, have_bound_regions, span } =
1890+
info;
1891+
1892+
db.span_label(span, "");
1893+
let help_name = if let Some(ident) =
1894+
parent.and_then(|body| self.tcx.hir().body(body).params[index].pat.simple_ident())
1895+
{
1896+
format!("`{}`", ident)
1897+
} else {
1898+
format!("argument {}", index + 1)
1899+
};
1900+
1901+
m.push_str(
1902+
&(if n == 1 {
1903+
help_name
1904+
} else {
1905+
format!(
1906+
"one of {}'s {} {}lifetimes",
1907+
help_name,
1908+
n,
1909+
if have_bound_regions { "free " } else { "" }
1910+
)
1911+
})[..],
1912+
);
1913+
1914+
if elided_len == 2 && i == 0 {
1915+
m.push_str(" or ");
1916+
} else if i + 2 == elided_len {
1917+
m.push_str(", or ");
1918+
} else if i != elided_len - 1 {
1919+
m.push_str(", ");
1920+
}
1921+
}
1922+
1923+
if len == 0 {
1924+
db.help(
1925+
"this function's return type contains a borrowed value, \
1926+
but there is no value for it to be borrowed from",
1927+
);
1928+
true
1929+
} else if elided_len == 0 {
1930+
db.help(
1931+
"this function's return type contains a borrowed value with \
1932+
an elided lifetime, but the lifetime cannot be derived from \
1933+
the arguments",
1934+
);
1935+
true
1936+
} else if elided_len == 1 {
1937+
db.help(&format!(
1938+
"this function's return type contains a borrowed value, \
1939+
but the signature does not say which {} it is borrowed from",
1940+
m
1941+
));
1942+
false
1943+
} else {
1944+
db.help(&format!(
1945+
"this function's return type contains a borrowed value, \
1946+
but the signature does not say whether it is borrowed from {}",
1947+
m
1948+
));
1949+
false
1950+
}
1951+
}
1952+
1953+
crate fn report_elided_lifetime_in_ty(&self, lifetime_refs: &[&hir::Lifetime]) {
1954+
let Some(missing_lifetime) = lifetime_refs.iter().find(|lt| {
1955+
lt.name == hir::LifetimeName::Implicit(true)
1956+
}) else { return };
1957+
1958+
let mut spans: Vec<_> = lifetime_refs.iter().map(|lt| lt.span).collect();
1959+
spans.sort();
1960+
let mut spans_dedup = spans.clone();
1961+
spans_dedup.dedup();
1962+
let spans_with_counts: Vec<_> = spans_dedup
1963+
.into_iter()
1964+
.map(|sp| (sp, spans.iter().filter(|nsp| *nsp == &sp).count()))
1965+
.collect();
1966+
1967+
self.tcx.struct_span_lint_hir(
1968+
rustc_session::lint::builtin::ELIDED_LIFETIMES_IN_PATHS,
1969+
missing_lifetime.hir_id,
1970+
spans,
1971+
|lint| {
1972+
let mut db = lint.build("hidden lifetime parameters in types are deprecated");
1973+
self.add_missing_lifetime_specifiers_label(
1974+
&mut db,
1975+
spans_with_counts,
1976+
&FxHashSet::from_iter([kw::UnderscoreLifetime]),
1977+
Vec::new(),
1978+
&[],
1979+
);
1980+
db.emit()
1981+
},
1982+
);
1983+
}
1984+
18741985
// FIXME(const_generics): This patches over an ICE caused by non-'static lifetimes in const
18751986
// generics. We are disallowing this until we can decide on how we want to handle non-'static
18761987
// lifetimes in const generics. See issue #74052 for discussion.
@@ -2297,7 +2408,9 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
22972408
);
22982409
let is_allowed_lifetime = matches!(
22992410
lifetime_ref.name,
2300-
hir::LifetimeName::Implicit | hir::LifetimeName::Static | hir::LifetimeName::Underscore
2411+
hir::LifetimeName::Implicit(_)
2412+
| hir::LifetimeName::Static
2413+
| hir::LifetimeName::Underscore
23012414
);
23022415

23032416
if !self.tcx.lazy_normalization() && is_anon_const && !is_allowed_lifetime {

‎compiler/rustc_resolve/src/late/lifetimes.rs

Lines changed: 56 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,11 @@ enum Elide {
357357
#[derive(Clone, Debug)]
358358
crate struct ElisionFailureInfo {
359359
/// Where we can find the argument pattern.
360-
parent: Option<hir::BodyId>,
360+
crate parent: Option<hir::BodyId>,
361361
/// The index of the argument in the original definition.
362-
index: usize,
363-
lifetime_count: usize,
364-
have_bound_regions: bool,
362+
crate index: usize,
363+
crate lifetime_count: usize,
364+
crate have_bound_regions: bool,
365365
crate span: Span,
366366
}
367367

@@ -923,7 +923,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
923923
}
924924
});
925925
match lifetime.name {
926-
LifetimeName::Implicit => {
926+
LifetimeName::Implicit(_) => {
927927
// For types like `dyn Foo`, we should
928928
// generate a special form of elided.
929929
span_bug!(ty.span, "object-lifetime-default expected, not implicit",);
@@ -3057,9 +3057,9 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
30573057
let error = loop {
30583058
match *scope {
30593059
// Do not assign any resolution, it will be inferred.
3060-
Scope::Body { .. } => return,
3060+
Scope::Body { .. } => break Ok(()),
30613061

3062-
Scope::Root => break None,
3062+
Scope::Root => break Err(None),
30633063

30643064
Scope::Binder { s, ref lifetimes, scope_type, .. } => {
30653065
// collect named lifetimes for suggestions
@@ -3076,50 +3076,54 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
30763076
scope = s;
30773077
}
30783078

3079-
Scope::Elision { ref elide, ref s, .. } => {
3080-
let lifetime = match *elide {
3081-
Elide::FreshLateAnon(named_late_bound_vars, ref counter) => {
3082-
for lifetime_ref in lifetime_refs {
3083-
let lifetime = Region::late_anon(named_late_bound_vars, counter)
3084-
.shifted(late_depth);
3079+
Scope::Elision {
3080+
elide: Elide::FreshLateAnon(named_late_bound_vars, ref counter),
3081+
..
3082+
} => {
3083+
for lifetime_ref in lifetime_refs {
3084+
let lifetime =
3085+
Region::late_anon(named_late_bound_vars, counter).shifted(late_depth);
30853086

3086-
self.insert_lifetime(lifetime_ref, lifetime);
3087-
}
3088-
return;
3089-
}
3090-
Elide::Exact(l) => l.shifted(late_depth),
3091-
Elide::Error(ref e) => {
3092-
let mut scope = s;
3093-
loop {
3094-
match scope {
3095-
Scope::Binder { ref lifetimes, s, .. } => {
3096-
// Collect named lifetimes for suggestions.
3097-
for name in lifetimes.keys() {
3098-
if let hir::ParamName::Plain(name) = name {
3099-
lifetime_names.insert(name.name);
3100-
lifetime_spans.push(name.span);
3101-
}
3102-
}
3103-
scope = s;
3104-
}
3105-
Scope::ObjectLifetimeDefault { ref s, .. }
3106-
| Scope::Elision { ref s, .. }
3107-
| Scope::TraitRefBoundary { ref s, .. } => {
3108-
scope = s;
3087+
self.insert_lifetime(lifetime_ref, lifetime);
3088+
}
3089+
break Ok(());
3090+
}
3091+
3092+
Scope::Elision { elide: Elide::Exact(l), .. } => {
3093+
let lifetime = l.shifted(late_depth);
3094+
for lifetime_ref in lifetime_refs {
3095+
self.insert_lifetime(lifetime_ref, lifetime);
3096+
}
3097+
break Ok(());
3098+
}
3099+
3100+
Scope::Elision { elide: Elide::Error(ref e), ref s, .. } => {
3101+
let mut scope = s;
3102+
loop {
3103+
match scope {
3104+
Scope::Binder { ref lifetimes, s, .. } => {
3105+
// Collect named lifetimes for suggestions.
3106+
for name in lifetimes.keys() {
3107+
if let hir::ParamName::Plain(name) = name {
3108+
lifetime_names.insert(name.name);
3109+
lifetime_spans.push(name.span);
31093110
}
3110-
_ => break,
31113111
}
3112+
scope = s;
3113+
}
3114+
Scope::ObjectLifetimeDefault { ref s, .. }
3115+
| Scope::Elision { ref s, .. }
3116+
| Scope::TraitRefBoundary { ref s, .. } => {
3117+
scope = s;
31123118
}
3113-
break Some(&e[..]);
3119+
_ => break,
31143120
}
3115-
Elide::Forbid => break None,
3116-
};
3117-
for lifetime_ref in lifetime_refs {
3118-
self.insert_lifetime(lifetime_ref, lifetime);
31193121
}
3120-
return;
3122+
break Err(Some(&e[..]));
31213123
}
31223124

3125+
Scope::Elision { elide: Elide::Forbid, .. } => break Err(None),
3126+
31233127
Scope::ObjectLifetimeDefault { s, .. }
31243128
| Scope::Supertrait { s, .. }
31253129
| Scope::TraitRefBoundary { s, .. } => {
@@ -3128,6 +3132,14 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
31283132
}
31293133
};
31303134

3135+
let error = match error {
3136+
Ok(()) => {
3137+
self.report_elided_lifetime_in_ty(lifetime_refs);
3138+
return;
3139+
}
3140+
Err(error) => error,
3141+
};
3142+
31313143
// If we specifically need the `scope_for_path` map, then we're in the
31323144
// diagnostic pass and we don't want to emit more errors.
31333145
if self.map.scope_for_path.is_some() {
@@ -3166,84 +3178,6 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
31663178
err.emit();
31673179
}
31683180

3169-
fn report_elision_failure(
3170-
&mut self,
3171-
db: &mut DiagnosticBuilder<'_>,
3172-
params: &[ElisionFailureInfo],
3173-
) -> bool /* add `'static` lifetime to lifetime list */ {
3174-
let mut m = String::new();
3175-
let len = params.len();
3176-
3177-
let elided_params: Vec<_> =
3178-
params.iter().cloned().filter(|info| info.lifetime_count > 0).collect();
3179-
3180-
let elided_len = elided_params.len();
3181-
3182-
for (i, info) in elided_params.into_iter().enumerate() {
3183-
let ElisionFailureInfo { parent, index, lifetime_count: n, have_bound_regions, span } =
3184-
info;
3185-
3186-
db.span_label(span, "");
3187-
let help_name = if let Some(ident) =
3188-
parent.and_then(|body| self.tcx.hir().body(body).params[index].pat.simple_ident())
3189-
{
3190-
format!("`{}`", ident)
3191-
} else {
3192-
format!("argument {}", index + 1)
3193-
};
3194-
3195-
m.push_str(
3196-
&(if n == 1 {
3197-
help_name
3198-
} else {
3199-
format!(
3200-
"one of {}'s {} {}lifetimes",
3201-
help_name,
3202-
n,
3203-
if have_bound_regions { "free " } else { "" }
3204-
)
3205-
})[..],
3206-
);
3207-
3208-
if elided_len == 2 && i == 0 {
3209-
m.push_str(" or ");
3210-
} else if i + 2 == elided_len {
3211-
m.push_str(", or ");
3212-
} else if i != elided_len - 1 {
3213-
m.push_str(", ");
3214-
}
3215-
}
3216-
3217-
if len == 0 {
3218-
db.help(
3219-
"this function's return type contains a borrowed value, \
3220-
but there is no value for it to be borrowed from",
3221-
);
3222-
true
3223-
} else if elided_len == 0 {
3224-
db.help(
3225-
"this function's return type contains a borrowed value with \
3226-
an elided lifetime, but the lifetime cannot be derived from \
3227-
the arguments",
3228-
);
3229-
true
3230-
} else if elided_len == 1 {
3231-
db.help(&format!(
3232-
"this function's return type contains a borrowed value, \
3233-
but the signature does not say which {} it is borrowed from",
3234-
m
3235-
));
3236-
false
3237-
} else {
3238-
db.help(&format!(
3239-
"this function's return type contains a borrowed value, \
3240-
but the signature does not say whether it is borrowed from {}",
3241-
m
3242-
));
3243-
false
3244-
}
3245-
}
3246-
32473181
fn resolve_object_lifetime_default(&mut self, lifetime_ref: &'tcx hir::Lifetime) {
32483182
debug!("resolve_object_lifetime_default(lifetime_ref={:?})", lifetime_ref);
32493183
let mut late_depth = 0;
@@ -3348,7 +3282,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
33483282
))
33493283
.emit();
33503284
}
3351-
hir::LifetimeName::Param(_) | hir::LifetimeName::Implicit => {
3285+
hir::LifetimeName::Param(_) | hir::LifetimeName::Implicit(_) => {
33523286
self.resolve_lifetime_ref(lt);
33533287
}
33543288
hir::LifetimeName::ImplicitObjectLifetimeDefault => {

‎src/test/ui/in-band-lifetimes/elided-lifetimes.fixed

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@
55
#![deny(elided_lifetimes_in_paths)]
66
//~^ NOTE the lint level is defined here
77

8-
use std::cell::{RefCell, Ref};
8+
use std::cell::{Ref, RefCell};
99

10-
11-
struct Foo<'a> { x: &'a u32 }
10+
struct Foo<'a> {
11+
x: &'a u32,
12+
}
1213

1314
fn foo(x: &Foo<'_>) {
1415
//~^ ERROR hidden lifetime parameters in types are deprecated
15-
//~| HELP indicate the anonymous lifetime
16+
//~| NOTE expected named lifetime parameter
17+
//~| HELP consider using the `'_` lifetime
1618
}
1719

1820
fn bar(x: &Foo<'_>) {}
1921

20-
2122
struct Wrapped<'a>(&'a str);
2223

2324
struct WrappedWithBow<'a> {
24-
gift: &'a str
25+
gift: &'a str,
2526
}
2627

2728
struct MatchedSet<'a, 'b> {
@@ -31,22 +32,34 @@ struct MatchedSet<'a, 'b> {
3132

3233
fn wrap_gift(gift: &str) -> Wrapped<'_> {
3334
//~^ ERROR hidden lifetime parameters in types are deprecated
34-
//~| HELP indicate the anonymous lifetime
35+
//~| NOTE expected named lifetime parameter
36+
//~| HELP consider using the `'_` lifetime
3537
Wrapped(gift)
3638
}
3739

3840
fn wrap_gift_with_bow(gift: &str) -> WrappedWithBow<'_> {
3941
//~^ ERROR hidden lifetime parameters in types are deprecated
40-
//~| HELP indicate the anonymous lifetime
42+
//~| NOTE expected named lifetime parameter
43+
//~| HELP consider using the `'_` lifetime
4144
WrappedWithBow { gift }
4245
}
4346

4447
fn inspect_matched_set(set: MatchedSet<'_, '_>) {
4548
//~^ ERROR hidden lifetime parameters in types are deprecated
46-
//~| HELP indicate the anonymous lifetime
49+
//~| NOTE expected 2 lifetime parameters
50+
//~| HELP consider using the `'_` lifetime
4751
println!("{} {}", set.one, set.another);
4852
}
4953

54+
// Verify that the lint does not fire, because the added `'_` wouldn't be resolved correctly.
55+
fn match_sets() -> MatchedSet<'static, 'static> {
56+
//~^ ERROR missing lifetime specifiers
57+
//~| NOTE expected 2 lifetime parameters
58+
//~| HELP this function's return type contains a borrowed value
59+
//~| HELP consider using the `'static` lifetime
60+
MatchedSet { one: "one", another: "another" }
61+
}
62+
5063
macro_rules! autowrapper {
5164
($type_name:ident, $fn_name:ident, $lt:lifetime) => {
5265
struct $type_name<$lt> {
@@ -55,7 +68,11 @@ macro_rules! autowrapper {
5568

5669
fn $fn_name(gift: &str) -> $type_name<'_> {
5770
//~^ ERROR hidden lifetime parameters in types are deprecated
58-
//~| HELP indicate the anonymous lifetime
71+
//~| NOTE expected named lifetime parameter
72+
//~| HELP consider using the `'_` lifetime
73+
//~| ERROR hidden lifetime parameters in types are deprecated
74+
//~| NOTE expected named lifetime parameter
75+
//~| HELP consider using the `'_` lifetime
5976
$type_name { gift }
6077
}
6178
}
@@ -65,19 +82,34 @@ autowrapper!(Autowrapped, autowrap_gift, 'a);
6582
//~^ NOTE in this expansion of autowrapper!
6683
//~| NOTE in this expansion of autowrapper!
6784

85+
// Verify that rustfix does not try to apply the fix twice.
86+
autowrapper!(AutowrappedAgain, autowrap_gift_again, 'a);
87+
//~^ NOTE in this expansion of autowrapper!
88+
//~| NOTE in this expansion of autowrapper!
89+
6890
macro_rules! anytuple_ref_ty {
6991
($($types:ty),*) => {
7092
Ref<'_, ($($types),*)>
7193
//~^ ERROR hidden lifetime parameters in types are deprecated
72-
//~| HELP indicate the anonymous lifetime
94+
//~| NOTE expected named lifetime parameter
95+
//~| HELP consider using the `'_` lifetime
7396
}
7497
}
7598

99+
#[allow(elided_lifetimes_in_paths)]
100+
mod blah {
101+
struct Thing<'a>(&'a i32);
102+
struct Bar<T>(T);
103+
104+
fn foo(b: Bar<Thing>) {}
105+
}
106+
76107
fn main() {
77108
let honesty = RefCell::new((4, 'e'));
78109
let loyalty: Ref<'_, (u32, char)> = honesty.borrow();
79110
//~^ ERROR hidden lifetime parameters in types are deprecated
80-
//~| HELP indicate the anonymous lifetime
111+
//~| NOTE expected named lifetime parameter
112+
//~| HELP consider using the `'_` lifetime
81113
let generosity = Ref::map(loyalty, |t| &t.0);
82114

83115
let laughter = RefCell::new((true, "magic"));

‎src/test/ui/in-band-lifetimes/elided-lifetimes.rs

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@
55
#![deny(elided_lifetimes_in_paths)]
66
//~^ NOTE the lint level is defined here
77

8-
use std::cell::{RefCell, Ref};
8+
use std::cell::{Ref, RefCell};
99

10-
11-
struct Foo<'a> { x: &'a u32 }
10+
struct Foo<'a> {
11+
x: &'a u32,
12+
}
1213

1314
fn foo(x: &Foo) {
1415
//~^ ERROR hidden lifetime parameters in types are deprecated
15-
//~| HELP indicate the anonymous lifetime
16+
//~| NOTE expected named lifetime parameter
17+
//~| HELP consider using the `'_` lifetime
1618
}
1719

1820
fn bar(x: &Foo<'_>) {}
1921

20-
2122
struct Wrapped<'a>(&'a str);
2223

2324
struct WrappedWithBow<'a> {
24-
gift: &'a str
25+
gift: &'a str,
2526
}
2627

2728
struct MatchedSet<'a, 'b> {
@@ -31,22 +32,34 @@ struct MatchedSet<'a, 'b> {
3132

3233
fn wrap_gift(gift: &str) -> Wrapped {
3334
//~^ ERROR hidden lifetime parameters in types are deprecated
34-
//~| HELP indicate the anonymous lifetime
35+
//~| NOTE expected named lifetime parameter
36+
//~| HELP consider using the `'_` lifetime
3537
Wrapped(gift)
3638
}
3739

3840
fn wrap_gift_with_bow(gift: &str) -> WrappedWithBow {
3941
//~^ ERROR hidden lifetime parameters in types are deprecated
40-
//~| HELP indicate the anonymous lifetime
42+
//~| NOTE expected named lifetime parameter
43+
//~| HELP consider using the `'_` lifetime
4144
WrappedWithBow { gift }
4245
}
4346

4447
fn inspect_matched_set(set: MatchedSet) {
4548
//~^ ERROR hidden lifetime parameters in types are deprecated
46-
//~| HELP indicate the anonymous lifetime
49+
//~| NOTE expected 2 lifetime parameters
50+
//~| HELP consider using the `'_` lifetime
4751
println!("{} {}", set.one, set.another);
4852
}
4953

54+
// Verify that the lint does not fire, because the added `'_` wouldn't be resolved correctly.
55+
fn match_sets() -> MatchedSet {
56+
//~^ ERROR missing lifetime specifiers
57+
//~| NOTE expected 2 lifetime parameters
58+
//~| HELP this function's return type contains a borrowed value
59+
//~| HELP consider using the `'static` lifetime
60+
MatchedSet { one: "one", another: "another" }
61+
}
62+
5063
macro_rules! autowrapper {
5164
($type_name:ident, $fn_name:ident, $lt:lifetime) => {
5265
struct $type_name<$lt> {
@@ -55,7 +68,11 @@ macro_rules! autowrapper {
5568

5669
fn $fn_name(gift: &str) -> $type_name {
5770
//~^ ERROR hidden lifetime parameters in types are deprecated
58-
//~| HELP indicate the anonymous lifetime
71+
//~| NOTE expected named lifetime parameter
72+
//~| HELP consider using the `'_` lifetime
73+
//~| ERROR hidden lifetime parameters in types are deprecated
74+
//~| NOTE expected named lifetime parameter
75+
//~| HELP consider using the `'_` lifetime
5976
$type_name { gift }
6077
}
6178
}
@@ -65,19 +82,34 @@ autowrapper!(Autowrapped, autowrap_gift, 'a);
6582
//~^ NOTE in this expansion of autowrapper!
6683
//~| NOTE in this expansion of autowrapper!
6784

85+
// Verify that rustfix does not try to apply the fix twice.
86+
autowrapper!(AutowrappedAgain, autowrap_gift_again, 'a);
87+
//~^ NOTE in this expansion of autowrapper!
88+
//~| NOTE in this expansion of autowrapper!
89+
6890
macro_rules! anytuple_ref_ty {
6991
($($types:ty),*) => {
7092
Ref<($($types),*)>
7193
//~^ ERROR hidden lifetime parameters in types are deprecated
72-
//~| HELP indicate the anonymous lifetime
94+
//~| NOTE expected named lifetime parameter
95+
//~| HELP consider using the `'_` lifetime
7396
}
7497
}
7598

99+
#[allow(elided_lifetimes_in_paths)]
100+
mod blah {
101+
struct Thing<'a>(&'a i32);
102+
struct Bar<T>(T);
103+
104+
fn foo(b: Bar<Thing>) {}
105+
}
106+
76107
fn main() {
77108
let honesty = RefCell::new((4, 'e'));
78109
let loyalty: Ref<(u32, char)> = honesty.borrow();
79110
//~^ ERROR hidden lifetime parameters in types are deprecated
80-
//~| HELP indicate the anonymous lifetime
111+
//~| NOTE expected named lifetime parameter
112+
//~| HELP consider using the `'_` lifetime
81113
let generosity = Ref::map(loyalty, |t| &t.0);
82114

83115
let laughter = RefCell::new((true, "magic"));

‎src/test/ui/in-band-lifetimes/elided-lifetimes.stderr

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,120 @@
11
error: hidden lifetime parameters in types are deprecated
2-
--> $DIR/elided-lifetimes.rs:13:12
2+
--> $DIR/elided-lifetimes.rs:14:12
33
|
44
LL | fn foo(x: &Foo) {
5-
| ^^^- help: indicate the anonymous lifetime: `<'_>`
5+
| ^^^ expected named lifetime parameter
66
|
77
note: the lint level is defined here
88
--> $DIR/elided-lifetimes.rs:5:9
99
|
1010
LL | #![deny(elided_lifetimes_in_paths)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^
12+
help: consider using the `'_` lifetime
13+
|
14+
LL | fn foo(x: &Foo<'_>) {
15+
| ~~~~~~~
1216

1317
error: hidden lifetime parameters in types are deprecated
14-
--> $DIR/elided-lifetimes.rs:32:29
18+
--> $DIR/elided-lifetimes.rs:33:29
1519
|
1620
LL | fn wrap_gift(gift: &str) -> Wrapped {
17-
| ^^^^^^^- help: indicate the anonymous lifetime: `<'_>`
21+
| ^^^^^^^ expected named lifetime parameter
22+
|
23+
help: consider using the `'_` lifetime
24+
|
25+
LL | fn wrap_gift(gift: &str) -> Wrapped<'_> {
26+
| ~~~~~~~~~~~
1827

1928
error: hidden lifetime parameters in types are deprecated
20-
--> $DIR/elided-lifetimes.rs:38:38
29+
--> $DIR/elided-lifetimes.rs:40:38
2130
|
2231
LL | fn wrap_gift_with_bow(gift: &str) -> WrappedWithBow {
23-
| ^^^^^^^^^^^^^^- help: indicate the anonymous lifetime: `<'_>`
32+
| ^^^^^^^^^^^^^^ expected named lifetime parameter
33+
|
34+
help: consider using the `'_` lifetime
35+
|
36+
LL | fn wrap_gift_with_bow(gift: &str) -> WrappedWithBow<'_> {
37+
| ~~~~~~~~~~~~~~~~~~
2438

2539
error: hidden lifetime parameters in types are deprecated
26-
--> $DIR/elided-lifetimes.rs:44:29
40+
--> $DIR/elided-lifetimes.rs:47:29
2741
|
2842
LL | fn inspect_matched_set(set: MatchedSet) {
29-
| ^^^^^^^^^^- help: indicate the anonymous lifetimes: `<'_, '_>`
43+
| ^^^^^^^^^^ expected 2 lifetime parameters
44+
|
45+
help: consider using the `'_` lifetime
46+
|
47+
LL | fn inspect_matched_set(set: MatchedSet<'_, '_>) {
48+
| ~~~~~~~~~~~~~~~~~~
49+
50+
error[E0106]: missing lifetime specifiers
51+
--> $DIR/elided-lifetimes.rs:55:20
52+
|
53+
LL | fn match_sets() -> MatchedSet {
54+
| ^^^^^^^^^^ expected 2 lifetime parameters
55+
|
56+
= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
57+
help: consider using the `'static` lifetime
58+
|
59+
LL | fn match_sets() -> MatchedSet<'static, 'static> {
60+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3061

3162
error: hidden lifetime parameters in types are deprecated
32-
--> $DIR/elided-lifetimes.rs:56:36
63+
--> $DIR/elided-lifetimes.rs:69:36
3364
|
3465
LL | fn $fn_name(gift: &str) -> $type_name {
35-
| ^^^^^^^^^^- help: indicate the anonymous lifetime: `<'_>`
66+
| ^^^^^^^^^^ expected named lifetime parameter
3667
...
3768
LL | autowrapper!(Autowrapped, autowrap_gift, 'a);
3869
| -------------------------------------------- in this macro invocation
3970
|
4071
= note: this error originates in the macro `autowrapper` (in Nightly builds, run with -Z macro-backtrace for more info)
72+
help: consider using the `'_` lifetime
73+
|
74+
LL | fn $fn_name(gift: &str) -> $type_name<'_> {
75+
| ~~~~~~~~~~~~~~
4176

4277
error: hidden lifetime parameters in types are deprecated
43-
--> $DIR/elided-lifetimes.rs:78:18
78+
--> $DIR/elided-lifetimes.rs:69:36
79+
|
80+
LL | fn $fn_name(gift: &str) -> $type_name {
81+
| ^^^^^^^^^^ expected named lifetime parameter
82+
...
83+
LL | autowrapper!(AutowrappedAgain, autowrap_gift_again, 'a);
84+
| ------------------------------------------------------- in this macro invocation
85+
|
86+
= note: this error originates in the macro `autowrapper` (in Nightly builds, run with -Z macro-backtrace for more info)
87+
help: consider using the `'_` lifetime
88+
|
89+
LL | fn $fn_name(gift: &str) -> $type_name<'_> {
90+
| ~~~~~~~~~~~~~~
91+
92+
error: hidden lifetime parameters in types are deprecated
93+
--> $DIR/elided-lifetimes.rs:109:22
4494
|
4595
LL | let loyalty: Ref<(u32, char)> = honesty.borrow();
46-
| ^^^^^^^^^^^^^^^^ help: indicate the anonymous lifetime: `Ref<'_, (u32, char)>`
96+
| ^ expected named lifetime parameter
97+
|
98+
help: consider using the `'_` lifetime
99+
|
100+
LL | let loyalty: Ref<'_, (u32, char)> = honesty.borrow();
101+
| +++
47102

48103
error: hidden lifetime parameters in types are deprecated
49-
--> $DIR/elided-lifetimes.rs:70:9
104+
--> $DIR/elided-lifetimes.rs:92:13
50105
|
51106
LL | Ref<($($types),*)>
52-
| ^^^^^^^^^^^^^^^^^^ help: indicate the anonymous lifetime: `Ref<'_, ($($types),*)>`
107+
| ^ expected named lifetime parameter
53108
...
54109
LL | let yellow: anytuple_ref_ty!(bool, &str) = laughter.borrow();
55110
| ---------------------------- in this macro invocation
56111
|
57112
= note: this error originates in the macro `anytuple_ref_ty` (in Nightly builds, run with -Z macro-backtrace for more info)
113+
help: consider using the `'_` lifetime
114+
|
115+
LL | Ref<'_, ($($types),*)>
116+
| +++
58117

59-
error: aborting due to 7 previous errors
118+
error: aborting due to 9 previous errors
60119

120+
For more information about this error, try `rustc --explain E0106`.

‎src/test/ui/lint/force-warn/allowed-by-default-lint.stderr

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ warning: hidden lifetime parameters in types are deprecated
22
--> $DIR/allowed-by-default-lint.rs:9:12
33
|
44
LL | fn foo(x: &Foo) {}
5-
| ^^^- help: indicate the anonymous lifetime: `<'_>`
5+
| ^^^ expected named lifetime parameter
66
|
77
= note: requested on the command line with `--force-warn elided-lifetimes-in-paths`
8+
help: consider using the `'_` lifetime
9+
|
10+
LL | fn foo(x: &Foo<'_>) {}
11+
| ~~~~~~~
812

913
warning: 1 warning emitted
1014

‎src/test/ui/lint/reasons.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// check-pass
22

33
#![feature(lint_reasons)]
4-
54
#![warn(elided_lifetimes_in_paths,
65
//~^ NOTE the lint level is defined here
76
reason = "explicit anonymous lifetimes aid reasoning about ownership")]
@@ -20,8 +19,9 @@ pub struct CheaterDetectionMechanism {}
2019
impl fmt::Debug for CheaterDetectionMechanism {
2120
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
2221
//~^ WARN hidden lifetime parameters in types are deprecated
22+
//~| NOTE expected named lifetime parameter
2323
//~| NOTE explicit anonymous lifetimes aid
24-
//~| HELP indicate the anonymous lifetime
24+
//~| HELP consider using the `'_` lifetime
2525
fmt.debug_struct("CheaterDetectionMechanism").finish()
2626
}
2727
}

‎src/test/ui/lint/reasons.stderr

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
warning: hidden lifetime parameters in types are deprecated
2-
--> $DIR/reasons.rs:21:29
2+
--> $DIR/reasons.rs:20:29
33
|
44
LL | fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
5-
| ^^^^^^^^^^^^^^- help: indicate the anonymous lifetime: `<'_>`
5+
| ^^^^^^^^^^^^^^ expected named lifetime parameter
66
|
77
= note: explicit anonymous lifetimes aid reasoning about ownership
88
note: the lint level is defined here
9-
--> $DIR/reasons.rs:5:9
9+
--> $DIR/reasons.rs:4:9
1010
|
1111
LL | #![warn(elided_lifetimes_in_paths,
1212
| ^^^^^^^^^^^^^^^^^^^^^^^^^
13+
help: consider using the `'_` lifetime
14+
|
15+
LL | fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
16+
| ~~~~~~~~~~~~~~~~~~
1317

1418
warning: variable `Social_exchange_psychology` should have a snake case name
1519
--> $DIR/reasons.rs:30:9
@@ -20,7 +24,7 @@ LL | let Social_exchange_psychology = CheaterDetectionMechanism {};
2024
= note: people shouldn't have to change their usual style habits
2125
to contribute to our project
2226
note: the lint level is defined here
23-
--> $DIR/reasons.rs:9:5
27+
--> $DIR/reasons.rs:8:5
2428
|
2529
LL | nonstandard_style,
2630
| ^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)
Please sign in to comment.