---

yaml
---
r: 145270
b: refs/heads/try2
c: 5165ecd
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 85c0fb7b8a81fc48a2155decd20abf16b1c5eeb6
+refs/heads/try2: 5165ecde66913874225ebd9d013b2cd4140fe69d
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/lang_items.rs

@@ -59,36 +59,36 @@ pub enum LangItem {
 
     StrEqFnLangItem,                   // 19
     UniqStrEqFnLangItem,               // 20
-    FailFnLangItem,                    // 21
-    FailBoundsCheckFnLangItem,         // 22
-    ExchangeMallocFnLangItem,          // 23
-    ClosureExchangeMallocFnLangItem,   // 24
-    ExchangeFreeFnLangItem,            // 25
-    MallocFnLangItem,                  // 26
-    FreeFnLangItem,                    // 27
-    BorrowAsImmFnLangItem,             // 28
-    BorrowAsMutFnLangItem,             // 29
-    ReturnToMutFnLangItem,             // 30
-    CheckNotBorrowedFnLangItem,        // 31
-    StrDupUniqFnLangItem,              // 32
-    RecordBorrowFnLangItem,            // 33
-    UnrecordBorrowFnLangItem,          // 34
-
-    StartFnLangItem,                   // 35
-
-    TyDescStructLangItem,              // 36
-    TyVisitorTraitLangItem,            // 37
-    OpaqueStructLangItem,              // 38
+    FailFnLangItem,                    // 22
+    FailBoundsCheckFnLangItem,         // 23
+    ExchangeMallocFnLangItem,          // 24
+    ClosureExchangeMallocFnLangItem,   // 25
+    ExchangeFreeFnLangItem,            // 26
+    MallocFnLangItem,                  // 27
+    FreeFnLangItem,                    // 28
+    BorrowAsImmFnLangItem,             // 29
+    BorrowAsMutFnLangItem,             // 30
+    ReturnToMutFnLangItem,             // 31
+    CheckNotBorrowedFnLangItem,        // 32
+    StrDupUniqFnLangItem,              // 33
+    RecordBorrowFnLangItem,            // 34
+    UnrecordBorrowFnLangItem,          // 35
+
+    StartFnLangItem,                   // 36
+
+    TyDescStructLangItem,              // 37
+    TyVisitorTraitLangItem,            // 38
+    OpaqueStructLangItem,              // 39
 }
 
 pub struct LanguageItems {
-    items: [Option<DefId>, ..39]
+    items: [Option<DefId>, ..41]
 }
 
 impl LanguageItems {
     pub fn new() -> LanguageItems {
         LanguageItems {
-            items: [ None, ..39 ]
+            items: [ None, ..41 ]
         }
     }
 
@@ -122,26 +122,27 @@ impl LanguageItems {
 
             19 => "str_eq",
             20 => "uniq_str_eq",
-            21 => "fail_",
-            22 => "fail_bounds_check",
-            23 => "exchange_malloc",
-            24 => "closure_exchange_malloc",
-            25 => "exchange_free",
-            26 => "malloc",
-            27 => "free",
-            28 => "borrow_as_imm",
-            29 => "borrow_as_mut",
-            30 => "return_to_mut",
-            31 => "check_not_borrowed",
-            32 => "strdup_uniq",
-            33 => "record_borrow",
-            34 => "unrecord_borrow",
-
-            35 => "start",
-
-            36 => "ty_desc",
-            37 => "ty_visitor",
-            38 => "opaque",
+            21 => "log_type",
+            22 => "fail_",
+            23 => "fail_bounds_check",
+            24 => "exchange_malloc",
+            25 => "closure_exchange_malloc",
+            26 => "exchange_free",
+            27 => "malloc",
+            28 => "free",
+            29 => "borrow_as_imm",
+            30 => "borrow_as_mut",
+            31 => "return_to_mut",
+            32 => "check_not_borrowed",
+            33 => "strdup_uniq",
+            34 => "record_borrow",
+            35 => "unrecord_borrow",
+
+            36 => "start",
+
+            37 => "ty_desc",
+            38 => "ty_visitor",
+            39 => "opaque",
 
             _ => "???"
         }

branches/try2/src/libstd/rt/io/process.rs

@@ -151,6 +151,7 @@ mod tests {
 
     #[test]
     #[cfg(unix, not(android))]
+    #[ignore] // FIXME(#9341)
     fn smoke() {
         let io = ~[];
         let args = ProcessConfig {
@@ -168,6 +169,7 @@ mod tests {
 
     #[test]
     #[cfg(unix, not(android))]
+    #[ignore] // FIXME(#9341)
     fn smoke_failure() {
         let io = ~[];
         let args = ProcessConfig {
@@ -185,6 +187,7 @@ mod tests {
 
     #[test]
     #[cfg(unix, not(android))]
+    #[ignore] // FIXME(#9341)
     fn exit_reported_right() {
         let io = ~[];
         let args = ProcessConfig {
@@ -225,6 +228,7 @@ mod tests {
 
     #[test]
     #[cfg(unix, not(android))]
+    #[ignore] // FIXME(#9341)
     fn stdout_works() {
         let pipe = PipeStream::new().unwrap();
         let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -240,6 +244,7 @@ mod tests {
 
     #[test]
     #[cfg(unix, not(android))]
+    #[ignore] // FIXME(#9341)
     fn set_cwd_works() {
         let pipe = PipeStream::new().unwrap();
         let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -256,6 +261,7 @@ mod tests {
 
     #[test]
     #[cfg(unix, not(android))]
+    #[ignore] // FIXME(#9341)
     fn stdin_works() {
         let input = PipeStream::new().unwrap();
         let output = PipeStream::new().unwrap();