Skip to content

Commit 1364631

Browse files
ShE3pyShE3py
committed
rt::Argument: elide lifetimes
1 parent 17a19e6 commit 1364631

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎library/core/src/fmt/rt.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ pub struct Argument<'a> {
9494
}
9595

9696
#[rustc_diagnostic_item = "ArgumentMethods"]
97-
impl<'a> Argument<'a> {
97+
impl Argument<'_> {
9898
#[inline(always)]
99-
fn new<'b, T>(x: &'b T, f: fn(&T, &mut Formatter<'_>) -> Result) -> Argument<'b> {
99+
fn new<'a, T>(x: &'a T, f: fn(&T, &mut Formatter<'_>) -> Result) -> Argument<'a> {
100100
Argument {
101-
// INVARIANT: this creates an `ArgumentType<'b>` from a `&'b T` and
101+
// INVARIANT: this creates an `ArgumentType<'a>` from a `&'a T` and
102102
// a `fn(&T, ...)`, so the invariant is maintained.
103103
ty: ArgumentType::Placeholder {
104104
value: NonNull::from(x).cast(),
@@ -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<'b> {
113+
pub fn new_display<T: Display>(x: &T) -> Argument<'_> {
114114
Self::new(x, Display::fmt)
115115
}
116116
#[inline(always)]
117-
pub fn new_debug<'b, T: Debug>(x: &'b T) -> Argument<'b> {
117+
pub fn new_debug<T: Debug>(x: &T) -> Argument<'_> {
118118
Self::new(x, Debug::fmt)
119119
}
120120
#[inline(always)]
121-
pub fn new_debug_noop<'b, T: Debug>(x: &'b T) -> Argument<'b> {
121+
pub fn new_debug_noop<T: Debug>(x: &T) -> Argument<'_> {
122122
Self::new(x, |_, _| Ok(()))
123123
}
124124
#[inline(always)]
125-
pub fn new_octal<'b, T: Octal>(x: &'b T) -> Argument<'b> {
125+
pub fn new_octal<T: Octal>(x: &T) -> Argument<'_> {
126126
Self::new(x, Octal::fmt)
127127
}
128128
#[inline(always)]
129-
pub fn new_lower_hex<'b, T: LowerHex>(x: &'b T) -> Argument<'b> {
129+
pub fn new_lower_hex<T: LowerHex>(x: &T) -> Argument<'_> {
130130
Self::new(x, LowerHex::fmt)
131131
}
132132
#[inline(always)]
133-
pub fn new_upper_hex<'b, T: UpperHex>(x: &'b T) -> Argument<'b> {
133+
pub fn new_upper_hex<T: UpperHex>(x: &T) -> Argument<'_> {
134134
Self::new(x, UpperHex::fmt)
135135
}
136136
#[inline(always)]
137-
pub fn new_pointer<'b, T: Pointer>(x: &'b T) -> Argument<'b> {
137+
pub fn new_pointer<T: Pointer>(x: &T) -> Argument<'_> {
138138
Self::new(x, Pointer::fmt)
139139
}
140140
#[inline(always)]
141-
pub fn new_binary<'b, T: Binary>(x: &'b T) -> Argument<'b> {
141+
pub fn new_binary<T: Binary>(x: &T) -> Argument<'_> {
142142
Self::new(x, Binary::fmt)
143143
}
144144
#[inline(always)]
145-
pub fn new_lower_exp<'b, T: LowerExp>(x: &'b T) -> Argument<'b> {
145+
pub fn new_lower_exp<T: LowerExp>(x: &T) -> Argument<'_> {
146146
Self::new(x, LowerExp::fmt)
147147
}
148148
#[inline(always)]
149-
pub fn new_upper_exp<'b, T: UpperExp>(x: &'b T) -> Argument<'b> {
149+
pub fn new_upper_exp<T: UpperExp>(x: &T) -> Argument<'_> {
150150
Self::new(x, UpperExp::fmt)
151151
}
152152
#[inline(always)]

‎tests/ui/closures/issue-111932.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LL | println!("{:?}", foo);
1717
| required by a bound introduced by this call
1818
|
1919
= help: the trait `Sized` is not implemented for `dyn Foo`
20-
note: required by an implicit `Sized` bound in `core::fmt::rt::Argument::<'a>::new_debug`
20+
note: required by an implicit `Sized` bound in `core::fmt::rt::Argument::<'_>::new_debug`
2121
--> $SRC_DIR/core/src/fmt/rt.rs:LL:COL
2222
= note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
2323

‎tests/ui/const-generics/infer/issue-77092.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ LL | println!("{:?}", take_array_from_mut(&mut arr, i));
2525
= note: required for `[i32; _]` to implement `Debug`
2626
= note: 1 redundant requirement hidden
2727
= note: required for `&mut [i32; _]` to implement `Debug`
28-
note: required by a bound in `core::fmt::rt::Argument::<'a>::new_debug`
28+
note: required by a bound in `core::fmt::rt::Argument::<'_>::new_debug`
2929
--> $SRC_DIR/core/src/fmt/rt.rs:LL:COL
3030
help: consider specifying the generic arguments
3131
|

‎tests/ui/fmt/ifmt-unimpl.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LL | format!("{:X}", "3");
1717
i32
1818
and 9 others
1919
= note: required for `&str` to implement `UpperHex`
20-
note: required by a bound in `core::fmt::rt::Argument::<'a>::new_upper_hex`
20+
note: required by a bound in `core::fmt::rt::Argument::<'_>::new_upper_hex`
2121
--> $SRC_DIR/core/src/fmt/rt.rs:LL:COL
2222
= note: this error originates in the macro `$crate::__export::format_args` which comes from the expansion of the macro `format` (in Nightly builds, run with -Z macro-backtrace for more info)
2323

0 commit comments

Comments
 (0)