---

yaml
---
r: 63326
b: refs/heads/snap-stage3
c: 104e612
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 893c70d7bc670054ef646b71d4d503298cc50d76
+refs/heads/snap-stage3: 104e6120b1161e6d242644c987b65525daa5ad5a
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/RELEASES.txt

@@ -4,7 +4,7 @@ Version 0.7 (July 2013)
    * ??? changes, numerous bugfixes
 
    * Syntax changes
-      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`      
+      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`
 
    * Semantic changes
       * The `self` parameter no longer implicitly means `&'self self`,

branches/snap-stage3/src/etc/adb_run_wrapper.sh

@@ -2,7 +2,7 @@
 # usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
 #
 
-# Sometimes android shell produce exitcode "1 : Text File Busy" 
+# Sometimes android shell produce exitcode "1 : Text File Busy"
 # Retry after $WAIT seconds, expecting resource cleaned-up
 WAIT=10
 PATH=$1
@@ -20,15 +20,15 @@ then
         while [ $L_RET -eq 1 ]
         do
             LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
-            L_RET=$? 
+            L_RET=$?
             if [ $L_COUNT -gt 0 ]
             then
                /system/bin/sleep $WAIT
                /system/bin/sync
             fi
             L_COUNT=`expr $L_COUNT+1`
         done
-        
+
         echo $L_RET > $PATH/$RUN.exitcode
 
     fi

branches/snap-stage3/src/librustc/middle/borrowck/gather_loans/gather_moves.rs

@@ -161,4 +161,3 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
         }
     }
 }
-

branches/snap-stage3/src/librustc/middle/effect.rs

@@ -154,4 +154,3 @@ pub fn check_crate(tcx: ty::ctxt,
 
     visit::visit_crate(crate, ((), visitor))
 }
-

branches/snap-stage3/src/libstd/char.rs

@@ -17,8 +17,8 @@ use u32;
 use uint;
 use unicode::{derived_property, general_category};
 
-#[cfg(not(test))] use cmp::{Eq, Ord};
-#[cfg(not(test))] use num::Zero;
+#[cfg(not(test))]
+use cmp::{Eq, Ord};
 
 /*
     Lu  Uppercase_Letter        an uppercase letter
@@ -328,12 +328,6 @@ impl Ord for char {
     fn ge(&self, other: &char) -> bool { *self >= *other }
 }
 
-#[cfg(not(test))]
-impl Zero for char {
-    fn zero() -> char { 0 as char }
-    fn is_zero(&self) -> bool { *self == 0 as char }
-}
-
 #[test]
 fn test_is_lowercase() {
     assert!('a'.is_lowercase());

branches/snap-stage3/src/libstd/core.rc

@@ -232,4 +232,3 @@ mod std {
     pub use str;
     pub use os;
 }
-

branches/snap-stage3/src/libstd/num/num.rs

@@ -418,21 +418,6 @@ pub fn pow_with_uint<T:NumCast+One+Zero+Copy+Div<T,T>+Mul<T,T>>(radix: uint, pow
     total
 }
 
-impl<T: Zero> Zero for @mut T {
-    fn zero() -> @mut T { @mut Zero::zero() }
-    fn is_zero(&self) -> bool { (**self).is_zero() }
-}
-
-impl<T: Zero> Zero for @T {
-    fn zero() -> @T { @Zero::zero() }
-    fn is_zero(&self) -> bool { (**self).is_zero() }
-}
-
-impl<T: Zero> Zero for ~T {
-    fn zero() -> ~T { ~Zero::zero() }
-    fn is_zero(&self) -> bool { (**self).is_zero() }
-}
-
 /// Helper function for testing numeric operations
 #[cfg(test)]
 pub fn test_num<T:Num + NumCast>(ten: T, two: T) {

branches/snap-stage3/src/libstd/option.rs

@@ -350,11 +350,6 @@ impl<T:Copy + Zero> Option<T> {
     }
 }
 
-impl<T> Zero for Option<T> {
-    fn zero() -> Option<T> { None }
-    fn is_zero(&self) -> bool { self.is_none() }
-}
-
 /// Immutable iterator over an `Option<A>`
 pub struct OptionIterator<'self, A> {
     priv opt: Option<&'self A>

branches/snap-stage3/src/libstd/rt/comm.rs

@@ -615,4 +615,3 @@ mod test {
         }
     }
 }
-

branches/snap-stage3/src/libstd/rt/io/stdio.rs

@@ -50,4 +50,3 @@ impl Writer for StdWriter {
 
     fn flush(&mut self) { fail!() }
 }
-

branches/snap-stage3/src/libstd/rt/task.rs

@@ -228,4 +228,3 @@ mod test {
         }
     }
 }
-

branches/snap-stage3/src/libstd/rt/test.rs

@@ -189,4 +189,3 @@ pub fn stress_factor() -> uint {
         None => 1
     }
 }
-

branches/snap-stage3/src/libstd/str.rs

@@ -28,7 +28,6 @@ use container::Container;
 use iter::Times;
 use iterator::{Iterator, IteratorUtil, FilterIterator, AdditiveIterator};
 use libc;
-use num::Zero;
 use option::{None, Option, Some};
 use old_iter::{BaseIter, EqIter};
 use ptr;
@@ -2251,16 +2250,6 @@ impl<'self> Iterator<u8> for StrBytesRevIterator<'self> {
     }
 }
 
-impl Zero for ~str {
-    fn zero() -> ~str { ~"" }
-    fn is_zero(&self) -> bool { self.len() == 0 }
-}
-
-impl Zero for @str {
-    fn zero() -> @str { @"" }
-    fn is_zero(&self) -> bool { self.len() == 0 }
-}
-
 #[cfg(test)]
 mod tests {
     use iterator::IteratorUtil;

branches/snap-stage3/src/libstd/tuple.rs

@@ -135,7 +135,6 @@ macro_rules! tuple_impls {
         pub mod inner {
             use clone::Clone;
             #[cfg(not(test))] use cmp::*;
-            #[cfg(not(test))] use num::Zero;
 
             $(
                 pub trait $cloneable_trait<$($T),+> {
@@ -211,18 +210,6 @@ macro_rules! tuple_impls {
                         lexical_cmp!($(self.$get_ref_fn(), other.$get_ref_fn()),+)
                     }
                 }
-
-                #[cfg(not(test))]
-                impl<$($T:Zero),+> Zero for ($($T),+) {
-                    #[inline]
-                    fn zero() -> ($($T),+) {
-                        ($(Zero::zero::<$T>()),+)
-                    }
-                    #[inline]
-                    fn is_zero(&self) -> bool {
-                        $(self.$get_ref_fn().is_zero())&&+
-                    }
-                }
             )+
         }
     }

branches/snap-stage3/src/libstd/vec.rs

@@ -23,7 +23,6 @@ use iterator::{Iterator, IteratorUtil};
 use iter::FromIter;
 use kinds::Copy;
 use libc;
-use num::Zero;
 use old_iter::CopyableIter;
 use option::{None, Option, Some};
 use ptr::to_unsafe_ptr;
@@ -2703,16 +2702,6 @@ impl<A:Clone> Clone for ~[A] {
     }
 }
 
-impl<A> Zero for ~[A] {
-    fn zero() -> ~[A] { ~[] }
-    fn is_zero(&self) -> bool { self.len() == 0 }
-}
-
-impl<A> Zero for @[A] {
-    fn zero() -> @[A] { @[] }
-    fn is_zero(&self) -> bool { self.len() == 0 }
-}
-
 macro_rules! iterator {
     /* FIXME: #4375 Cannot attach documentation/attributes to a macro generated struct.
     (struct $name:ident -> $ptr:ty, $elem:ty) => {

branches/snap-stage3/src/libsyntax/ext/deriving/mod.rs

@@ -32,7 +32,6 @@ pub mod encodable;
 pub mod decodable;
 pub mod rand;
 pub mod to_str;
-pub mod zero;
 
 #[path="cmp/eq.rs"]
 pub mod eq;
@@ -100,7 +99,6 @@ pub fn expand_meta_deriving(cx: @ExtCtxt,
                             "Rand" => expand!(rand::expand_deriving_rand),
 
                             "ToStr" => expand!(to_str::expand_deriving_to_str),
-                            "Zero" => expand!(zero::expand_deriving_zero),
 
                             ref tname => {
                                 cx.span_err(titem.span, fmt!("unknown \

branches/snap-stage3/src/libsyntax/ext/deriving/zero.rs

@@ -63,4 +63,3 @@ impl append_types for @ast::Path {
         }
     }
 }
-

branches/snap-stage3/src/libsyntax/ext/pipes/ast_builder.rs

@@ -156,4 +156,3 @@ free_env(rust_env *env) {
     free(env->rust_seed);
     free(env);
 }
-

branches/snap-stage3/src/rt/rust_env.cpp

@@ -54,4 +54,3 @@
 #include <fcntl.h>
 #include <unistd.h>
 #endif
-

branches/snap-stage3/src/rustllvm/rustllvm.h

@@ -20,4 +20,3 @@ use std::libc;
 extern {
     pub fn rust_get_argc() -> libc::c_int;
 }
-

branches/snap-stage3/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs

@@ -2,4 +2,3 @@ pub enum Foo {
     pub Bar,
     priv Baz,
 }
-

branches/snap-stage3/src/test/auxiliary/private_variant_xc.rs

@@ -7,4 +7,3 @@ struct Foo;
 impl Foo {
     pub fn new() {}
 }
-

branches/snap-stage3/src/test/auxiliary/use_from_trait_xc.rs

@@ -44,4 +44,3 @@ mod issue6935 {
 }
 
 fn main(){}
-

branches/snap-stage3/src/test/compile-fail/lint-unused-import-tricky-names.rs

@@ -6,4 +6,3 @@ pub fn main() {
     let _ = private_variant_xc::Bar;
     let _ = private_variant_xc::Baz;    //~ ERROR unresolved name
 }
-

branches/snap-stage3/src/test/compile-fail/private-variant-xc.rs

@@ -9,4 +9,3 @@ use use_from_trait_xc::Foo::new;    //~ ERROR cannot import from a trait or type
 
 fn main() {
 }
-

branches/snap-stage3/src/test/compile-fail/use-from-trait-xc.rs

@@ -14,4 +14,3 @@ impl Foo {
 }
 
 fn main() {}
-

branches/snap-stage3/src/test/compile-fail/use-from-trait.rs

@@ -10,6 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test #6122
+
 #[forbid(deprecated_pattern)];
 
 extern mod extra;

branches/snap-stage3/src/test/run-pass/auto-encode.rs

@@ -11,4 +11,3 @@ struct Bar {
 static bar: Bar = Bar { i: 0, v: IntVal(0) };
 
 fn main() {}
-