---

yaml
---
r: 53960
b: refs/heads/dist-snap
c: bc211f5
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 18a594f49af6c0541cd78146600b30f7208ed146
+refs/heads/dist-snap: bc211f5032dc6ca5650b2c8f437ecfd425ddfccd
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libsyntax/ext/deriving/mod.rs renamed to branches/dist-snap/src/libsyntax/ext/deriving.rs

@@ -456,6 +456,11 @@ pub fn core_macros() -> ~str {
             if !$cond {
                 ::core::sys::fail_assert(stringify!($cond), file!(), line!())
             }
+        };
+        ($cond:expr, $msg:expr) => {
+            if !$cond {
+                ::core::sys::fail_assert($msg, file!(), line!())
+            }
         }
     )
 

branches/dist-snap/src/libsyntax/ext/expand.rs

@@ -64,8 +64,6 @@ pub mod ext {
     pub mod expand;
 
     pub mod quote;
-
-    #[path = "deriving/mod.rs"]
     pub mod deriving;
 
     pub mod build;

branches/dist-snap/src/libsyntax/syntax.rc

@@ -0,0 +1,15 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// error-pattern:custom message
+
+fn main() {
+    fail_unless!(false, "custom message");
+}