From 3fcdb7d6a758ac4ed1f27fcda77c372edaab4c09 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 10 Dec 2012 17:22:10 -0800 Subject: Adjust the die macro to only accept ~str and to work in statement position --- src/libsyntax/ext/expand.rs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 1890ec36bdd..e9d871752aa 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -378,21 +378,10 @@ fn core_macros() -> ~str { macro_rules! die( ($msg: expr) => ( - { - do core::str::as_buf($msg) |msg_buf, _msg_len| { - do core::str::as_buf(file!()) |file_buf, _file_len| { - unsafe { - let msg_buf = core::cast::transmute(msg_buf); - let file_buf = core::cast::transmute(file_buf); - let line = line!() as core::libc::size_t; - core::rt::rt_fail_(msg_buf, file_buf, line) - } - } - } - } + core::sys::begin_unwind($msg, file!(), line!()) ); () => ( - die!(\"explicit failure\") + die!(~\"explicit failure\") ) ) }"; -- cgit 1.4.1-3-g733a5