---

yaml
---
r: 139863
b: refs/heads/try2
c: d2a81b9
h: refs/heads/master
i:
  139861: 4ef4b83
  139859: 4ea2644
  139855: f5e5230
v: v3

Author: brendanzab

[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: e4f35a7326e4ea2af9b6000080819208a7f6d722
+refs/heads/try2: d2a81b95c3e2ccfdba0324caae531ce3528ed4e2
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

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

branches/try2/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/try2/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/try2/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/try2/src/libcore/io.rs

@@ -176,7 +176,7 @@ pub trait ReaderUtil {
     fn read_bytes(&self, len: uint) -> ~[u8];
 
     /**
-    * Reads up until a specific byte is seen or EOF.
+    * Reads up until a specific character or EOF.
     *
     * The `include` parameter specifies if the character should be included
     * in the returned string.
@@ -185,7 +185,7 @@ pub trait ReaderUtil {
     *
     * None right now.
     */
-    fn read_until(&self, c: u8, include: bool) -> ~str;
+    fn read_until(&self, c: char, include: bool) -> ~str;
 
     /**
     * Reads up until the first '\n' or EOF.
@@ -577,7 +577,7 @@ impl<T:Reader> ReaderUtil for T {
         bytes
     }
 
-    fn read_until(&self, c: u8, include: bool) -> ~str {
+    fn read_until(&self, c: char, include: bool) -> ~str {
         let mut bytes = ~[];
         loop {
             let ch = self.read_byte();
@@ -593,7 +593,7 @@ impl<T:Reader> ReaderUtil for T {
     }
 
     fn read_line(&self) -> ~str {
-        self.read_until('\n' as u8, false)
+        self.read_until('\n', false)
     }
 
     fn read_chars(&self, n: uint) -> ~[char] {
@@ -667,7 +667,7 @@ impl<T:Reader> ReaderUtil for T {
     }
 
     fn read_c_str(&self) -> ~str {
-        self.read_until(0u8, false)
+        self.read_until(0 as char, false)
     }
 
     fn read_whole_stream(&self) -> ~[u8] {
@@ -693,7 +693,7 @@ impl<T:Reader> ReaderUtil for T {
             // include the \n, so that we can distinguish an entirely empty
             // line read after "...\n", and the trailing empty line in
             // "...\n\n".
-            let mut line = self.read_until('\n' as u8, true);
+            let mut line = self.read_until('\n', true);
 
             // blank line at the end of the reader is ignored
             if self.eof() && line.is_empty() { break; }

branches/try2/src/libcore/iterator.rs

@@ -22,7 +22,6 @@ pub trait IteratorUtil<A> {
     // FIXME: #5898: should be called map
     fn transform<'r, B>(self, f: &'r fn(A) -> B) -> MapIterator<'r, A, B, Self>;
     fn filter<'r>(self, predicate: &'r fn(&A) -> bool) -> FilterIterator<'r, A, Self>;
-    fn enumerate(self) -> EnumerateIterator<Self>;
     fn advance(&mut self, f: &fn(A) -> bool);
 }
 
@@ -43,11 +42,6 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
         FilterIterator{iter: self, predicate: predicate}
     }
 
-    #[inline(always)]
-    fn enumerate(self) -> EnumerateIterator<T> {
-        EnumerateIterator{iter: self, count: 0}
-    }
-
     /// A shim implementing the `for` loop iteration protocol for iterator objects
     #[inline]
     fn advance(&mut self, f: &fn(A) -> bool) {
@@ -110,22 +104,3 @@ impl<'self, A, B, T: Iterator<A>> Iterator<B> for MapIterator<'self, A, B, T> {
         }
     }
 }
-
-pub struct EnumerateIterator<T> {
-    priv iter: T,
-    priv count: uint
-}
-
-impl<A, T: Iterator<A>> Iterator<(uint, A)> for EnumerateIterator<T> {
-    #[inline]
-    fn next(&mut self) -> Option<(uint, A)> {
-        match self.iter.next() {
-            Some(a) => {
-                let ret = Some((self.count, a));
-                self.count += 1;
-                ret
-            }
-            _ => None
-        }
-    }
-}

branches/try2/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/try2/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/try2/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/try2/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;