---

yaml
---
r: 56211
b: refs/heads/auto
c: d2a81b9
h: refs/heads/master
i:
  56209: ee614e6
  56207: d9e312b
v: v3

Author: brendanzab

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: f43fc5fff898d2c2d0b2a49ec35daf1005e76dd9
+refs/heads/auto: d2a81b95c3e2ccfdba0324caae531ce3528ed4e2
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/.gitignore

@@ -86,4 +86,3 @@ config.stamp
 .DS_Store
 src/etc/dl
 .settings/
-build/

branches/auto/doc/tutorial.md

@@ -1669,9 +1669,6 @@ do spawn {
 }
 ~~~~
 
-If you want to see the output of `debug!` statements, you will need to turn on `debug!` logging.
-To enable `debug!` logging, set the RUST_LOG environment variable to `debug` (e.g., with bash, `export RUST_LOG=debug`)
-
 ## For loops
 
 The most common way to express iteration in Rust is with a `for`

branches/auto/mk/rt.mk

@@ -76,8 +76,7 @@ RUNTIME_CXXS_$(1) := \
               rt/boxed_region.cpp \
               rt/arch/$$(HOST_$(1))/context.cpp \
               rt/arch/$$(HOST_$(1))/gpr.cpp \
-              rt/rust_android_dummy.cpp \
-              rt/rust_test_helpers.cpp
+              rt/rust_android_dummy.cpp
 
 RUNTIME_CS_$(1) := rt/linenoise/linenoise.c rt/linenoise/utf8.c
 

branches/auto/src/etc/x86.supp

@@ -654,11 +654,3 @@
    fun:_ZN5visit30visit_struct_dtor_helper_*
    ...
 }
-
-{
-   llvm-optimization-reads-uninitialized-memory-16
-   Memcheck:Cond
-   fun:_ZN7ast_map6map_fn*
-   fun:_ZN5visit30visit_struct_dtor_helper*
-   ...
-}

branches/auto/src/libcore/num/int-template.rs

@@ -199,6 +199,30 @@ impl ops::Modulo<T,T> for T {
 impl ops::Neg<T> for T {
     fn neg(&self) -> T { -*self }
 }
+#[cfg(notest)]
+impl ops::BitOr<T,T> for T {
+    fn bitor(&self, other: &T) -> T { *self | *other }
+}
+#[cfg(notest)]
+impl ops::BitAnd<T,T> for T {
+    fn bitand(&self, other: &T) -> T { *self & *other }
+}
+#[cfg(notest)]
+impl ops::BitXor<T,T> for T {
+    fn bitxor(&self, other: &T) -> T { *self ^ *other }
+}
+#[cfg(notest)]
+impl ops::Shl<T,T> for T {
+    fn shl(&self, other: &T) -> T { *self << *other }
+}
+#[cfg(notest)]
+impl ops::Shr<T,T> for T {
+    fn shr(&self, other: &T) -> T { *self >> *other }
+}
+#[cfg(notest)]
+impl ops::Not<T> for T {
+    fn not(&self) -> T { !*self }
+}
 
 // String conversion functions and impl str -> num
 
@@ -283,6 +307,16 @@ mod tests {
     use super::inst::T;
     use prelude::*;
 
+    #[test]
+    fn test_bitwise_ops() {
+        assert!(0b1110 as T == (0b1100 as T).bitor(&(0b1010 as T)));
+        assert!(0b1000 as T == (0b1100 as T).bitand(&(0b1010 as T)));
+        assert!(0b0110 as T == (0b1100 as T).bitxor(&(0b1010 as T)));
+        assert!(0b1110 as T == (0b0111 as T).shl(&(1 as T)));
+        assert!(0b0111 as T == (0b1110 as T).shr(&(1 as T)));
+        assert!(-(0b11 as T) - (1 as T) == (0b11 as T).not());
+    }
+
     #[test]
     fn test_from_str() {
         assert!(from_str(~"0") == Some(0 as T));

branches/auto/src/libcore/num/uint-template.rs

@@ -164,6 +164,30 @@ impl ops::Modulo<T,T> for T {
 impl ops::Neg<T> for T {
     fn neg(&self) -> T { -*self }
 }
+#[cfg(notest)]
+impl ops::BitOr<T,T> for T {
+    fn bitor(&self, other: &T) -> T { *self | *other }
+}
+#[cfg(notest)]
+impl ops::BitAnd<T,T> for T {
+    fn bitand(&self, other: &T) -> T { *self & *other }
+}
+#[cfg(notest)]
+impl ops::BitXor<T,T> for T {
+    fn bitxor(&self, other: &T) -> T { *self ^ *other }
+}
+#[cfg(notest)]
+impl ops::Shl<T,T> for T {
+    fn shl(&self, other: &T) -> T { *self << *other }
+}
+#[cfg(notest)]
+impl ops::Shr<T,T> for T {
+    fn shr(&self, other: &T) -> T { *self >> *other }
+}
+#[cfg(notest)]
+impl ops::Not<T> for T {
+    fn not(&self) -> T { !*self }
+}
 
 // String conversion functions and impl str -> num
 
@@ -247,6 +271,17 @@ mod tests {
     use super::*;
     use super::inst::T;
     use prelude::*;
+
+    #[test]
+    fn test_bitwise_ops() {
+        assert!(0b1110 as T == (0b1100 as T).bitor(&(0b1010 as T)));
+        assert!(0b1000 as T == (0b1100 as T).bitand(&(0b1010 as T)));
+        assert!(0b0110 as T == (0b1100 as T).bitxor(&(0b1010 as T)));
+        assert!(0b1110 as T == (0b0111 as T).shl(&(1 as T)));
+        assert!(0b0111 as T == (0b1110 as T).shr(&(1 as T)));
+        assert!(max_value - (0b1011 as T) == (0b1011 as T).not());
+    }
+
     #[test]
     pub fn test_to_str() {
         assert!(to_str_radix(0 as T, 10u) == ~"0");

branches/auto/src/libcore/repr.rs

@@ -23,9 +23,9 @@ use io::{Writer, WriterUtil};
 use libc::c_void;
 use managed;
 use ptr;
-#[cfg(stage0)] use sys;
 use reflect;
 use reflect::{MovePtr, align};
+use sys;
 use to_str::ToStr;
 use vec::UnboxedVecRepr;
 use vec::raw::{VecRepr, SliceRepr};
@@ -479,7 +479,7 @@ impl TyVisitor for ReprVisitor {
     }
 
     #[cfg(not(stage0))]
-    fn visit_enter_enum(&self, _n_variants: uint,
+    fn visit_enter_enum(&self, n_variants: uint,
                         get_disr: extern unsafe fn(ptr: *Opaque) -> int,
                         _sz: uint, _align: uint) -> bool {
         let disr = unsafe { get_disr(transmute(self.ptr)) };

branches/auto/src/libcore/rt/mod.rs

@@ -32,7 +32,6 @@ macro_rules! rtdebug (
     ($( $arg:expr),+) => ( $(let _ = $arg)*; )
 )
 
-#[path = "sched/mod.rs"]
 mod sched;
 mod rtio;
 pub mod uvll;