Merge pull request #7 from steveklabnik/master

alexcrichton · alexcrichton · commit a469534627de · 2014-10-29T20:58:47.000-05:00
fail -&gt; panic
diff --git a/tests/glob-std.rs b/tests/glob-std.rs
@@ -21,7 +21,7 @@ use std::io::TempDir;
 
 macro_rules! assert_eq ( ($e1:expr, $e2:expr) => (
     if $e1 != $e2 {
-        fail!("{} != {}", stringify!($e1), stringify!($e2))
+        panic!("{} != {}", stringify!($e1), stringify!($e2))
     }
 ) )
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ use std::io::TempDir;`
`21`	`21`
`22`	`22`	`macro_rules! assert_eq ( ($e1:expr, $e2:expr) => (`
`23`	`23`	`if $e1 != $e2 {`
`24`		`- fail!("{} != {}", stringify!($e1), stringify!($e2))`
	`24`	`+ panic!("{} != {}", stringify!($e1), stringify!($e2))`
`25`	`25`	`}`
`26`	`26`	`) )`
`27`	`27`