---

yaml
---
r: 63294
b: refs/heads/snap-stage3
c: f93a974
h: refs/heads/master
v: v3

Author: huonw

[refs]

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

branches/snap-stage3/CONTRIBUTING.md

@@ -1,15 +1,11 @@
 ## Pull request procedure
 
-Pull requests should be targeted at Rust's `incoming` branch (note
-that by default Github will aim them at the `master` branch) -- see
-"Changing The Commit Range and Destination Repository" in Github's
-documentation on [pull
-requests](https://help.github.com/articles/using-pull-requests).
+Pull requests should be targeted at Rust's `master` branch.
 Before pushing to your Github repo and issuing the pull request,
 please do two things:
 
 1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your
-   local changes against the `incoming` branch. Resolve any conflicts
+   local changes against the `master` branch. Resolve any conflicts
    that arise.
 
 2. Run the full Rust test suite with the `make check` command.  You're

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,3 +161,4 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
         }
     }
 }
+

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -78,19 +78,20 @@ fn rand_substructure(cx: @ExtCtxt, span: span, substr: &Substructure) -> @expr {
 
             let variant_count = cx.expr_uint(span, variants.len());
 
-            // need to specify the uint-ness of the random number
-            let u32_ty = cx.ty_ident(span, cx.ident_of("uint"));
+            // need to specify the u32-ness of the random number
+            let u32_ty = cx.ty_ident(span, cx.ident_of("u32"));
             let r_ty = cx.ty_ident(span, cx.ident_of("R"));
-            let rand_name = cx.path_all(span, false, copy rand_ident, None, ~[ u32_ty, r_ty ]);
+            let rand_name = cx.path_all(span, true, copy rand_ident, None, ~[ u32_ty, r_ty ]);
             let rand_name = cx.expr_path(rand_name);
 
+            // ::std::rand::Rand::rand::<u32>(rng)
             let rv_call = cx.expr_call(span,
                                        rand_name,
                                        ~[ rng[0].duplicate(cx) ]);
 
             // rand() % variants.len()
             let rand_variant = cx.expr_binary(span, ast::rem,
-                                                rv_call, variant_count);
+                                              rv_call, variant_count);
 
             let mut arms = do variants.mapi |i, id_sum| {
                 let i_expr = cx.expr_uint(span, i);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9,3 +9,4 @@ 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.rs

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

branches/snap-stage3/src/test/run-pass/const-struct-offsets.rs

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

branches/snap-stage3/src/test/run-pass/deriving-global.rs

@@ -0,0 +1,39 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+extern mod extra; // {En,De}codable
+mod submod {
+    // if any of these are implemented without global calls for any
+    // function calls, then being in a submodule will (correctly)
+    // cause errors about unrecognised module `std` (or `extra`)
+    #[deriving(Eq, Ord, TotalEq, TotalOrd,
+               IterBytes,
+               Clone, DeepClone,
+               ToStr, Rand,
+               Encodable, Decodable)]
+    enum A { A1(uint), A2(int) }
+
+    #[deriving(Eq, Ord, TotalEq, TotalOrd,
+               IterBytes,
+               Clone, DeepClone,
+               ToStr, Rand,
+               Encodable, Decodable)]
+    struct B { x: uint, y: int }
+
+    #[deriving(Eq, Ord, TotalEq, TotalOrd,
+               IterBytes,
+               Clone, DeepClone,
+               ToStr, Rand,
+               Encodable, Decodable)]
+    struct C(uint, int);
+
+}
+
+fn main() {}

branches/snap-stage3/src/test/run-pass/issue-4735.rs

@@ -26,3 +26,5 @@ fn main() {
     let p = unsafe { transmute::<~int, *c_void>(t) };
     let z = NonCopyable(p);
 }
+
+

branches/snap-stage3/src/test/run-pass/monomorphize-abi-alignment.rs

@@ -24,8 +24,8 @@ struct A((u32, u32));
 struct B(u64);
 
 pub fn main() {
-    static Ca: S<A> = S { i: 0, t: A((13, 104)) };
-    static Cb: S<B> = S { i: 0, t: B(31337) };
-    assert_eq!(*(Ca.unwrap()), (13, 104));
-    assert_eq!(*(Cb.unwrap()), 31337);
+	static Ca: S<A> = S { i: 0, t: A((13, 104)) };
+	static Cb: S<B> = S { i: 0, t: B(31337) };
+	assert_eq!(*(Ca.unwrap()), (13, 104));
+	assert_eq!(*(Cb.unwrap()), 31337);
 }

branches/snap-stage3/src/test/run-pass/multi-let.rs

@@ -13,3 +13,4 @@ pub fn main() {
     let y = x;
     assert!((y == 10));
 }
+

branches/snap-stage3/src/test/run-pass/pub-extern-privacy.rs

@@ -11,3 +11,4 @@ fn main() {
         a::free(transmute(0));
     }
 }
+