Skip to content

Commit e99a990

Browse files
authored
Rollup merge of rust-lang#110766 - m-ou-se:fmt-rt, r=jyn514
More core::fmt::rt cleanup. - Removes the `V1` suffix from the `Argument` and `Flag` types. - Moves more of the format_args lang items into the `core::fmt::rt` module. (The only remaining lang item in `core::fmt` is `Arguments` itself, which is a public type.) Part of rust-lang#99012 Follow-up to rust-lang#110616
2 parents 6bd8fee + 429d06b commit e99a990

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ macro_rules! format_args {
201201
}
202202
203203
fn main() {
204-
$crate::fmt::Arguments::new_v1(&[], &[$crate::fmt::ArgumentV1::new(&(arg1(a, b, c)), $crate::fmt::Display::fmt), $crate::fmt::ArgumentV1::new(&(arg2), $crate::fmt::Display::fmt), ]);
204+
$crate::fmt::Arguments::new_v1(&[], &[$crate::fmt::Argument::new(&(arg1(a, b, c)), $crate::fmt::Display::fmt), $crate::fmt::Argument::new(&(arg2), $crate::fmt::Display::fmt), ]);
205205
}
206206
"#]],
207207
);
@@ -229,7 +229,7 @@ macro_rules! format_args {
229229
}
230230
231231
fn main() {
232-
$crate::fmt::Arguments::new_v1(&[], &[$crate::fmt::ArgumentV1::new(&(a::<A, B>()), $crate::fmt::Display::fmt), $crate::fmt::ArgumentV1::new(&(b), $crate::fmt::Display::fmt), ]);
232+
$crate::fmt::Arguments::new_v1(&[], &[$crate::fmt::Argument::new(&(a::<A, B>()), $crate::fmt::Display::fmt), $crate::fmt::Argument::new(&(b), $crate::fmt::Display::fmt), ]);
233233
}
234234
"#]],
235235
);
@@ -260,7 +260,7 @@ macro_rules! format_args {
260260
fn main() {
261261
let _ =
262262
/* parse error: expected field name or number */
263-
$crate::fmt::Arguments::new_v1(&[], &[$crate::fmt::ArgumentV1::new(&(a.), $crate::fmt::Display::fmt), ]);
263+
$crate::fmt::Arguments::new_v1(&[], &[$crate::fmt::Argument::new(&(a.), $crate::fmt::Display::fmt), ]);
264264
}
265265
"#]],
266266
);

crates/hir-expand/src/builtin_fn_macro.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ fn format_args_expand(
241241
// We expand `format_args!("", a1, a2)` to
242242
// ```
243243
// $crate::fmt::Arguments::new_v1(&[], &[
244-
// $crate::fmt::ArgumentV1::new(&arg1,$crate::fmt::Display::fmt),
245-
// $crate::fmt::ArgumentV1::new(&arg2,$crate::fmt::Display::fmt),
244+
// $crate::fmt::Argument::new(&arg1,$crate::fmt::Display::fmt),
245+
// $crate::fmt::Argument::new(&arg2,$crate::fmt::Display::fmt),
246246
// ])
247247
// ```,
248248
// which is still not really correct, but close enough for now
@@ -267,7 +267,7 @@ fn format_args_expand(
267267
}
268268
let _format_string = args.remove(0);
269269
let arg_tts = args.into_iter().flat_map(|arg| {
270-
quote! { #DOLLAR_CRATE::fmt::ArgumentV1::new(&(#arg), #DOLLAR_CRATE::fmt::Display::fmt), }
270+
quote! { #DOLLAR_CRATE::fmt::Argument::new(&(#arg), #DOLLAR_CRATE::fmt::Display::fmt), }
271271
}.token_trees);
272272
let expanded = quote! {
273273
#DOLLAR_CRATE::fmt::Arguments::new_v1(&[], &[##arg_tts])

0 commit comments

Comments
 (0)