---

yaml
---
r: 127027
b: refs/heads/snap-stage3
c: ec79d36
h: refs/heads/master
i:
  127025: eb870b7
  127023: ba9f538
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f86184869a95199a2e0da844ad257c67f1aac97a
+refs/heads/snap-stage3: ec79d368d2f9b56ac1d00825108b4e8b8bd26498
 refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustrt/task.rs

@@ -649,7 +649,7 @@ mod test {
     #[should_fail]
     fn test_begin_unwind() {
         use std::rt::unwind::begin_unwind;
-        begin_unwind("cause", file!(), line!())
+        begin_unwind("cause", &(file!(), line!()))
     }
 
     #[test]

branches/snap-stage3/src/libuuid/lib.rs

@@ -29,6 +29,8 @@ unlikely.
 To create a new random (V4) UUID and print it out in hexadecimal form:
 
 ```rust
+# #![allow(deprecated)]
+# extern crate uuid;
 use uuid::Uuid;
 
 fn main() {

branches/snap-stage3/src/test/auxiliary/lang-item-public.rs

@@ -12,7 +12,7 @@
 #![feature(lang_items)]
 
 #[lang="fail_"]
-fn fail(_: &'static str, _: &'static str, _: uint) -> ! { loop {} }
+fn fail(_: &(&'static str, &'static str, uint)) -> ! { loop {} }
 
 #[lang = "stack_exhausted"]
 extern fn stack_exhausted() {}

branches/snap-stage3/src/test/run-pass/backtrace.rs

@@ -24,7 +24,10 @@ fn start(argc: int, argv: *const *const u8) -> int {
 
 #[inline(never)]
 fn foo() {
-    fail!()
+    let _v = vec![1i, 2, 3];
+    if os::getenv("IS_TEST").is_some() {
+        fail!()
+    }
 }
 
 #[inline(never)]
@@ -37,32 +40,35 @@ fn double() {
 }
 
 fn runtest(me: &str) {
+    let mut template = Command::new(me);
+    template.env("IS_TEST", "1");
+
     // Make sure that the stack trace is printed
-    let mut p = Command::new(me).arg("fail").env("RUST_BACKTRACE", "1").spawn().unwrap();
+    let p = template.clone().arg("fail").env("RUST_BACKTRACE", "1").spawn().unwrap();
     let out = p.wait_with_output().unwrap();
     assert!(!out.status.success());
     let s = str::from_utf8(out.error.as_slice()).unwrap();
     assert!(s.contains("stack backtrace") && s.contains("foo::h"),
             "bad output: {}", s);
 
     // Make sure the stack trace is *not* printed
-    let mut p = Command::new(me).arg("fail").spawn().unwrap();
+    let p = template.clone().arg("fail").spawn().unwrap();
     let out = p.wait_with_output().unwrap();
     assert!(!out.status.success());
     let s = str::from_utf8(out.error.as_slice()).unwrap();
     assert!(!s.contains("stack backtrace") && !s.contains("foo::h"),
             "bad output2: {}", s);
 
     // Make sure a stack trace is printed
-    let mut p = Command::new(me).arg("double-fail").spawn().unwrap();
+    let p = template.clone().arg("double-fail").spawn().unwrap();
     let out = p.wait_with_output().unwrap();
     assert!(!out.status.success());
     let s = str::from_utf8(out.error.as_slice()).unwrap();
     assert!(s.contains("stack backtrace") && s.contains("double::h"),
             "bad output3: {}", s);
 
     // Make sure a stack trace isn't printed too many times
-    let mut p = Command::new(me).arg("double-fail")
+    let p = template.clone().arg("double-fail")
                                 .env("RUST_BACKTRACE", "1").spawn().unwrap();
     let out = p.wait_with_output().unwrap();
     assert!(!out.status.success());