auto merge of #16703 : bluss/rust/assert-bloat, r=huonw

bors · bors · commit c556ca985396 · 2014-08-24T06:00:58.000Z
With no custom message, we should just use concat! + stringify! for `assert!(expr)` to avoid the string formatting code path. Inspired by issue #16625
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
@@ -96,7 +96,7 @@ macro_rules! fail(
 macro_rules! assert(
     ($cond:expr) => (
         if !$cond {
-            fail!("assertion failed: {:s}", stringify!($cond))
+            fail!(concat!("assertion failed: ", stringify!($cond)))
         }
     );
     ($cond:expr, $($arg:expr),+) => (

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ macro_rules! fail(`
`96`	`96`	`macro_rules! assert(`
`97`	`97`	`($cond:expr) => (`
`98`	`98`	`if !$cond {`
`99`		`- fail!("assertion failed: {:s}", stringify!($cond))`
	`99`	`+ fail!(concat!("assertion failed: ", stringify!($cond)))`
`100`	`100`	`}`
`101`	`101`	`);`
`102`	`102`	`($cond:expr, $($arg:expr),+) => (`