about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-24 02:17:29 +0000
committerbors <bors@rust-lang.org>2019-11-24 02:17:29 +0000
commite41ced3f8d8e2f3f377ef931458e612d5f3d1f3f (patch)
tree7d1fb15021ff6320393277ab0aeb5ce5ac5a566c /src/liballoc
parentad808d95c4839caedc2be76d0ed059dc920ab4b6 (diff)
parentd22bf91320cf3ba08326ca644e39de35592ce394 (diff)
downloadrust-e41ced3f8d8e2f3f377ef931458e612d5f3d1f3f.tar.gz
rust-e41ced3f8d8e2f3f377ef931458e612d5f3d1f3f.zip
Auto merge of #66686 - Centril:rollup-07slyoo, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #64856 (Scope format! temporaries)
 - #66411 (mem::forget docs: mention ManuallyDrop)
 - #66594 (Fix cycle when debug-printing opaque types)
 - #66641 (parser: recover on nested ADTs as enum variants)
 - #66659 (make `./x.py bench` again)

Failed merges:

r? @ghost
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/macros.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs
index 2f2cdc39c63..422d3486f92 100644
--- a/src/liballoc/macros.rs
+++ b/src/liballoc/macros.rs
@@ -98,5 +98,8 @@ macro_rules! vec {
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
 macro_rules! format {
-    ($($arg:tt)*) => ($crate::fmt::format($crate::__export::format_args!($($arg)*)))
+    ($($arg:tt)*) => {{
+        let res = $crate::fmt::format($crate::__export::format_args!($($arg)*));
+        res
+    }}
 }