Skip to content

Commit 60f37e4

Browse files
authored
Rollup merge of rust-lang#129207 - GrigorenkoPV:elided-is-named, r=cjgillot
Lint that warns when an elided lifetime ends up being a named lifetime As suggested in rust-lang#48686 (comment) Fixes rust-lang#48686
2 parents 68e6537 + 0402bb1 commit 60f37e4

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Diff for: alloc/src/string.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2313,7 +2313,7 @@ impl<'b> Pattern for &'b String {
23132313
}
23142314

23152315
#[inline]
2316-
fn strip_suffix_of<'a>(self, haystack: &'a str) -> Option<&str>
2316+
fn strip_suffix_of<'a>(self, haystack: &'a str) -> Option<&'a str>
23172317
where
23182318
Self::Searcher<'a>: core::str::pattern::ReverseSearcher<'a>,
23192319
{

Diff for: core/src/fmt/rt.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -110,43 +110,43 @@ impl<'a> Argument<'a> {
110110
}
111111

112112
#[inline(always)]
113-
pub fn new_display<'b, T: Display>(x: &'b T) -> Argument<'_> {
113+
pub fn new_display<'b, T: Display>(x: &'b T) -> Argument<'b> {
114114
Self::new(x, Display::fmt)
115115
}
116116
#[inline(always)]
117-
pub fn new_debug<'b, T: Debug>(x: &'b T) -> Argument<'_> {
117+
pub fn new_debug<'b, T: Debug>(x: &'b T) -> Argument<'b> {
118118
Self::new(x, Debug::fmt)
119119
}
120120
#[inline(always)]
121-
pub fn new_debug_noop<'b, T: Debug>(x: &'b T) -> Argument<'_> {
121+
pub fn new_debug_noop<'b, T: Debug>(x: &'b T) -> Argument<'b> {
122122
Self::new(x, |_, _| Ok(()))
123123
}
124124
#[inline(always)]
125-
pub fn new_octal<'b, T: Octal>(x: &'b T) -> Argument<'_> {
125+
pub fn new_octal<'b, T: Octal>(x: &'b T) -> Argument<'b> {
126126
Self::new(x, Octal::fmt)
127127
}
128128
#[inline(always)]
129-
pub fn new_lower_hex<'b, T: LowerHex>(x: &'b T) -> Argument<'_> {
129+
pub fn new_lower_hex<'b, T: LowerHex>(x: &'b T) -> Argument<'b> {
130130
Self::new(x, LowerHex::fmt)
131131
}
132132
#[inline(always)]
133-
pub fn new_upper_hex<'b, T: UpperHex>(x: &'b T) -> Argument<'_> {
133+
pub fn new_upper_hex<'b, T: UpperHex>(x: &'b T) -> Argument<'b> {
134134
Self::new(x, UpperHex::fmt)
135135
}
136136
#[inline(always)]
137-
pub fn new_pointer<'b, T: Pointer>(x: &'b T) -> Argument<'_> {
137+
pub fn new_pointer<'b, T: Pointer>(x: &'b T) -> Argument<'b> {
138138
Self::new(x, Pointer::fmt)
139139
}
140140
#[inline(always)]
141-
pub fn new_binary<'b, T: Binary>(x: &'b T) -> Argument<'_> {
141+
pub fn new_binary<'b, T: Binary>(x: &'b T) -> Argument<'b> {
142142
Self::new(x, Binary::fmt)
143143
}
144144
#[inline(always)]
145-
pub fn new_lower_exp<'b, T: LowerExp>(x: &'b T) -> Argument<'_> {
145+
pub fn new_lower_exp<'b, T: LowerExp>(x: &'b T) -> Argument<'b> {
146146
Self::new(x, LowerExp::fmt)
147147
}
148148
#[inline(always)]
149-
pub fn new_upper_exp<'b, T: UpperExp>(x: &'b T) -> Argument<'_> {
149+
pub fn new_upper_exp<'b, T: UpperExp>(x: &'b T) -> Argument<'b> {
150150
Self::new(x, UpperExp::fmt)
151151
}
152152
#[inline(always)]

0 commit comments

Comments
 (0)