Auto merge of #98396 - cjgillot:iwfchir, r=petrochenkov

[rust.git] / library / alloc / src / fmt.rs

diff --git a/library/alloc/src/fmt.rs b/library/alloc/src/fmt.rs
index 73b75ea4d83d5baff277aa164d5b8e2096d1d96a..ed398b56612ce700f68b444f6aaf0da652850dd5 100644 (file)
--- a/library/alloc/src/fmt.rs
+++ b/library/alloc/src/fmt.rs
@@ -604,9 +604,14 @@
 #[cfg(not(no_global_oom_handling))]
 #[must_use]
 #[stable(feature = "rust1", since = "1.0.0")]
+#[inline]
 pub fn format(args: Arguments<'_>) -> string::String {
-    let capacity = args.estimated_capacity();
-    let mut output = string::String::with_capacity(capacity);
-    output.write_fmt(args).expect("a formatting trait implementation returned an error");
-    output
+    fn format_inner(args: Arguments<'_>) -> string::String {
+        let capacity = args.estimated_capacity();
+        let mut output = string::String::with_capacity(capacity);
+        output.write_fmt(args).expect("a formatting trait implementation returned an error");
+        output
+    }
+
+    args.as_str().map_or_else(|| format_inner(args), crate::borrow::ToOwned::to_owned)
 }