auto merge of #7116 : thestinger/rust/whitespace, r=luqmana

Author: bors

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`,

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

src/librustc/middle/borrowck/gather_loans/gather_moves.rs

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

src/librustc/middle/effect.rs

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

src/libstd/core.rc

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

src/libstd/rt/comm.rs

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

src/libstd/rt/io/stdio.rs

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

src/libstd/rt/task.rs

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

src/libstd/rt/test.rs

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

src/libsyntax/ext/pipes/ast_builder.rs

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

src/rt/rust_env.cpp

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

src/rustllvm/rustllvm.h

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

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

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

src/test/auxiliary/private_variant_xc.rs

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

src/test/auxiliary/use_from_trait_xc.rs

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

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

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

src/test/compile-fail/private-variant-xc.rs

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

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

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

src/test/compile-fail/use-from-trait.rs

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

src/test/run-pass/const-struct-offsets.rs

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

src/test/run-pass/issue-4735.rs

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

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);
 }

src/test/run-pass/multi-let.rs

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

src/test/run-pass/pub-extern-privacy.rs

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