Auto merge of #15052 - lnicola:fmt-arguments, r=Veykril

bors · bors · commit 51939db8d351 · 2023-06-14T12:13:58.000Z
minor: Rename minicore ArgumentV1 to match libcore
diff --git a/crates/ide/src/inlay_hints/chaining.rs b/crates/ide/src/inlay_hints/chaining.rs
@@ -474,7 +474,7 @@ fn main() {
                                         file_id: FileId(
                                             1,
                                         ),
-                                        range: 9333..9341,
+                                        range: 9286..9294,
                                     },
                                 ),
                                 tooltip: "",
@@ -487,7 +487,7 @@ fn main() {
                                         file_id: FileId(
                                             1,
                                         ),
-                                        range: 9365..9369,
+                                        range: 9318..9322,
                                     },
                                 ),
                                 tooltip: "",
@@ -511,7 +511,7 @@ fn main() {
                                         file_id: FileId(
                                             1,
                                         ),
-                                        range: 9333..9341,
+                                        range: 9286..9294,
                                     },
                                 ),
                                 tooltip: "",
@@ -524,7 +524,7 @@ fn main() {
                                         file_id: FileId(
                                             1,
                                         ),
-                                        range: 9365..9369,
+                                        range: 9318..9322,
                                     },
                                 ),
                                 tooltip: "",
@@ -548,7 +548,7 @@ fn main() {
                                         file_id: FileId(
                                             1,
                                         ),
-                                        range: 9333..9341,
+                                        range: 9286..9294,
                                     },
                                 ),
                                 tooltip: "",
@@ -561,7 +561,7 @@ fn main() {
                                         file_id: FileId(
                                             1,
                                         ),
-                                        range: 9365..9369,
+                                        range: 9318..9322,
                                     },
                                 ),
                                 tooltip: "",
diff --git a/crates/test-utils/src/minicore.rs b/crates/test-utils/src/minicore.rs
@@ -867,29 +867,26 @@ pub mod fmt {
     }
 
     #[lang = "format_argument"]
-    pub struct ArgumentV1<'a> {
+    pub struct Argument<'a> {
         value: &'a Opaque,
         formatter: fn(&Opaque, &mut Formatter<'_>) -> Result,
     }
 
-    impl<'a> ArgumentV1<'a> {
-        pub fn new<'b, T>(x: &'b T, f: fn(&T, &mut Formatter<'_>) -> Result) -> ArgumentV1<'b> {
+    impl<'a> Argument<'a> {
+        pub fn new<'b, T>(x: &'b T, f: fn(&T, &mut Formatter<'_>) -> Result) -> Argument<'b> {
             use crate::mem::transmute;
-            unsafe { ArgumentV1 { formatter: transmute(f), value: transmute(x) } }
+            unsafe { Argument { formatter: transmute(f), value: transmute(x) } }
         }
     }
 
     #[lang = "format_arguments"]
     pub struct Arguments<'a> {
         pieces: &'a [&'static str],
-        args: &'a [ArgumentV1<'a>],
+        args: &'a [Argument<'a>],
     }
 
     impl<'a> Arguments<'a> {
-        pub const fn new_v1(
-            pieces: &'a [&'static str],
-            args: &'a [ArgumentV1<'a>],
-        ) -> Arguments<'a> {
+        pub const fn new_v1(pieces: &'a [&'static str], args: &'a [Argument<'a>]) -> Arguments<'a> {
             Arguments { pieces, args }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -867,29 +867,26 @@ pub mod fmt {`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`#[lang = "format_argument"]`
`870`		`- pub struct ArgumentV1<'a> {`
	`870`	`+ pub struct Argument<'a> {`
`871`	`871`	`value: &'a Opaque,`
`872`	`872`	`formatter: fn(&Opaque, &mut Formatter<'_>) -> Result,`
`873`	`873`	`}`
`874`	`874`
`875`		`- impl<'a> ArgumentV1<'a> {`
`876`		`- pub fn new<'b, T>(x: &'b T, f: fn(&T, &mut Formatter<'_>) -> Result) -> ArgumentV1<'b> {`
	`875`	`+ impl<'a> Argument<'a> {`
	`876`	`+ pub fn new<'b, T>(x: &'b T, f: fn(&T, &mut Formatter<'_>) -> Result) -> Argument<'b> {`
`877`	`877`	`use crate::mem::transmute;`
`878`		`- unsafe { ArgumentV1 { formatter: transmute(f), value: transmute(x) } }`
	`878`	`+ unsafe { Argument { formatter: transmute(f), value: transmute(x) } }`
`879`	`879`	`}`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`#[lang = "format_arguments"]`
`883`	`883`	`pub struct Arguments<'a> {`
`884`	`884`	`pieces: &'a [&'static str],`
`885`		`- args: &'a [ArgumentV1<'a>],`
	`885`	`+ args: &'a [Argument<'a>],`
`886`	`886`	`}`
`887`	`887`
`888`	`888`	`impl<'a> Arguments<'a> {`
`889`		`- pub const fn new_v1(`
`890`		`- pieces: &'a [&'static str],`
`891`		`- args: &'a [ArgumentV1<'a>],`
`892`		`- ) -> Arguments<'a> {`
	`889`	`+ pub const fn new_v1(pieces: &'a [&'static str], args: &'a [Argument<'a>]) -> Arguments<'a> {`
`893`	`890`	`Arguments { pieces, args }`
`894`	`891`	`}`
`895`	`892`	`}`