---

yaml
---
r: 42951
b: refs/heads/try
c: 6105f09
h: refs/heads/master
i:
  42949: 355d579
  42947: 4d72b43
  42943: cede17b
v: v3

Author: ILyoan

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 159568eab51313490ca9faabd67b0e05bc129460
+refs/heads/try: 6105f09cc163ab728ff0ef18d4f817ad1a34bfb3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/either.rs

@@ -150,23 +150,6 @@ pub pure fn unwrap_right<T,U>(eith: Either<T,U>) -> U {
 }
 
 impl<T, U> Either<T, U> {
-    #[inline(always)]
-    fn either<V>(&self, f_left: fn(&T) -> V, f_right: fn(&U) -> V) -> V {
-        either(f_left, f_right, self)
-    }
-
-    #[inline(always)]
-    fn flip(self) -> Either<U, T> { flip(self) }
-
-    #[inline(always)]
-    fn to_result(self) -> Result<U, T> { to_result(self) }
-
-    #[inline(always)]
-    fn is_left(&self) -> bool { is_left(self) }
-
-    #[inline(always)]
-    fn is_right(&self) -> bool { is_right(self) }
-
     #[inline(always)]
     fn unwrap_left(self) -> T { unwrap_left(self) }
 

branches/try/src/libcore/prelude.rs

@@ -12,37 +12,40 @@
 
 /* Reexported core operators */
 
-pub use either::{Either, Left, Right};
 pub use kinds::{Const, Copy, Owned, Durable};
+pub use ops::{Drop};
 pub use ops::{Add, Sub, Mul, Div, Modulo, Neg, Not};
 pub use ops::{BitAnd, BitOr, BitXor};
-pub use ops::{Drop};
 pub use ops::{Shl, Shr, Index};
 pub use option::{Option, Some, None};
 pub use result::{Result, Ok, Err};
 
 /* Reexported types and traits */
 
-pub use clone::Clone;
-pub use cmp::{Eq, Ord};
-pub use container::{Container, Mutable, Map, Set};
-pub use hash::Hash;
-pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
-pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
-pub use num::Num;
-pub use path::GenericPath;
 pub use path::Path;
-pub use path::PosixPath;
+pub use path::GenericPath;
 pub use path::WindowsPath;
-pub use pipes::{GenericChan, GenericPort};
-pub use ptr::Ptr;
-pub use str::{StrSlice, Trimmable};
-pub use to_bytes::IterBytes;
-pub use to_str::ToStr;
+pub use path::PosixPath;
+
 pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};
+pub use str::{StrSlice, Trimmable};
+pub use container::{Container, Mutable};
 pub use vec::{CopyableVector, ImmutableVector};
 pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
 pub use vec::{OwnedVector, OwnedCopyableVector};
+pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
+pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
+pub use container::{Container, Mutable, Map, Set};
+pub use pipes::{GenericChan, GenericPort};
+
+pub use num::Num;
+pub use ptr::Ptr;
+pub use to_str::ToStr;
+pub use clone::Clone;
+
+pub use cmp::{Eq, Ord};
+pub use hash::Hash;
+pub use to_bytes::IterBytes;
 
 /* Reexported modules */
 

branches/try/src/librustc/middle/trans/foreign.rs

@@ -42,7 +42,7 @@ use syntax::parse::token::special_idents;
 
 fn abi_info(arch: session::arch) -> cabi::ABIInfo {
     return match arch {
-        arch_x86_64 => x86_64_abi_info(),
+        arch_x86_64 | arch_arm => x86_64_abi_info(),
         _ => cabi::llvm_abi_info()
     }
 }