From ec276448708983e506cd2751feb4efedc096b13e Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 13 Jun 2013 17:59:34 -0400 Subject: [PATCH] automated whitespace fixes --- RELEASES.txt | 2 +- src/etc/adb_run_wrapper.sh | 6 +++--- src/librustc/middle/borrowck/gather_loans/gather_moves.rs | 1 - src/librustc/middle/effect.rs | 1 - src/libstd/core.rc | 1 - src/libstd/rt/comm.rs | 1 - src/libstd/rt/io/stdio.rs | 1 - src/libstd/rt/task.rs | 1 - src/libstd/rt/test.rs | 1 - src/libsyntax/ext/pipes/ast_builder.rs | 1 - src/rt/rust_env.cpp | 1 - src/rustllvm/rustllvm.h | 1 - src/test/auxiliary/anon-extern-mod-cross-crate-1.rs | 1 - src/test/auxiliary/private_variant_xc.rs | 1 - src/test/auxiliary/use_from_trait_xc.rs | 1 - src/test/compile-fail/lint-unused-import-tricky-names.rs | 1 - src/test/compile-fail/private-variant-xc.rs | 1 - src/test/compile-fail/use-from-trait-xc.rs | 1 - src/test/compile-fail/use-from-trait.rs | 1 - src/test/run-pass/const-struct-offsets.rs | 1 - src/test/run-pass/issue-4735.rs | 2 -- src/test/run-pass/monomorphize-abi-alignment.rs | 8 ++++---- src/test/run-pass/multi-let.rs | 1 - src/test/run-pass/pub-extern-privacy.rs | 1 - 24 files changed, 8 insertions(+), 30 deletions(-) diff --git a/RELEASES.txt b/RELEASES.txt index f2d23340d78..5bf160d6248 100644 --- a/RELEASES.txt +++ b/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`, diff --git a/src/etc/adb_run_wrapper.sh b/src/etc/adb_run_wrapper.sh index 68ac6b4242c..fb1e0937fc9 100755 --- a/src/etc/adb_run_wrapper.sh +++ b/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,7 +20,7 @@ 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 @@ -28,7 +28,7 @@ then fi L_COUNT=`expr $L_COUNT+1` done - + echo $L_RET > $PATH/$RUN.exitcode fi diff --git a/src/librustc/middle/borrowck/gather_loans/gather_moves.rs b/src/librustc/middle/borrowck/gather_loans/gather_moves.rs index d32c1873ba0..ef911c9a808 100644 --- a/src/librustc/middle/borrowck/gather_loans/gather_moves.rs +++ b/src/librustc/middle/borrowck/gather_loans/gather_moves.rs @@ -161,4 +161,3 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt, } } } - diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index 0d817a5c629..d9481c26dad 100644 --- a/src/librustc/middle/effect.rs +++ b/src/librustc/middle/effect.rs @@ -154,4 +154,3 @@ pub fn check_crate(tcx: ty::ctxt, visit::visit_crate(crate, ((), visitor)) } - diff --git a/src/libstd/core.rc b/src/libstd/core.rc index a6334cc0c49..3d871fce090 100644 --- a/src/libstd/core.rc +++ b/src/libstd/core.rc @@ -232,4 +232,3 @@ mod std { pub use str; pub use os; } - diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs index 8a8f31bbdfa..5d85e292861 100644 --- a/src/libstd/rt/comm.rs +++ b/src/libstd/rt/comm.rs @@ -615,4 +615,3 @@ mod test { } } } - diff --git a/src/libstd/rt/io/stdio.rs b/src/libstd/rt/io/stdio.rs index 247fe954408..57bec79563f 100644 --- a/src/libstd/rt/io/stdio.rs +++ b/src/libstd/rt/io/stdio.rs @@ -50,4 +50,3 @@ impl Writer for StdWriter { fn flush(&mut self) { fail!() } } - diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 620efed99ca..41390aec80c 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -228,4 +228,3 @@ mod test { } } } - diff --git a/src/libstd/rt/test.rs b/src/libstd/rt/test.rs index 453eab09730..fe08d85c947 100644 --- a/src/libstd/rt/test.rs +++ b/src/libstd/rt/test.rs @@ -189,4 +189,3 @@ pub fn stress_factor() -> uint { None => 1 } } - diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs index 08f1540918e..99ffd78d7ba 100644 --- a/src/libsyntax/ext/pipes/ast_builder.rs +++ b/src/libsyntax/ext/pipes/ast_builder.rs @@ -63,4 +63,3 @@ impl append_types for @ast::Path { } } } - diff --git a/src/rt/rust_env.cpp b/src/rt/rust_env.cpp index ed38be3550f..eaccb3b0a44 100644 --- a/src/rt/rust_env.cpp +++ b/src/rt/rust_env.cpp @@ -156,4 +156,3 @@ free_env(rust_env *env) { free(env->rust_seed); free(env); } - diff --git a/src/rustllvm/rustllvm.h b/src/rustllvm/rustllvm.h index 1c8842f7b4a..a66ad3704be 100644 --- a/src/rustllvm/rustllvm.h +++ b/src/rustllvm/rustllvm.h @@ -54,4 +54,3 @@ #include #include #endif - diff --git a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs index 77f257ea4f5..4bdb6d351d8 100644 --- a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs +++ b/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; } - diff --git a/src/test/auxiliary/private_variant_xc.rs b/src/test/auxiliary/private_variant_xc.rs index d7d55c691b6..a3a604d9e78 100644 --- a/src/test/auxiliary/private_variant_xc.rs +++ b/src/test/auxiliary/private_variant_xc.rs @@ -2,4 +2,3 @@ pub enum Foo { pub Bar, priv Baz, } - diff --git a/src/test/auxiliary/use_from_trait_xc.rs b/src/test/auxiliary/use_from_trait_xc.rs index 2ab95c271ae..d5abfd5754c 100644 --- a/src/test/auxiliary/use_from_trait_xc.rs +++ b/src/test/auxiliary/use_from_trait_xc.rs @@ -7,4 +7,3 @@ struct Foo; impl Foo { pub fn new() {} } - diff --git a/src/test/compile-fail/lint-unused-import-tricky-names.rs b/src/test/compile-fail/lint-unused-import-tricky-names.rs index 4b80c524715..a81a410cace 100644 --- a/src/test/compile-fail/lint-unused-import-tricky-names.rs +++ b/src/test/compile-fail/lint-unused-import-tricky-names.rs @@ -44,4 +44,3 @@ mod issue6935 { } fn main(){} - diff --git a/src/test/compile-fail/private-variant-xc.rs b/src/test/compile-fail/private-variant-xc.rs index c7838b98855..9db023a779b 100644 --- a/src/test/compile-fail/private-variant-xc.rs +++ b/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 } - diff --git a/src/test/compile-fail/use-from-trait-xc.rs b/src/test/compile-fail/use-from-trait-xc.rs index 56805f58ad2..3ac3e8c832d 100644 --- a/src/test/compile-fail/use-from-trait-xc.rs +++ b/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() { } - diff --git a/src/test/compile-fail/use-from-trait.rs b/src/test/compile-fail/use-from-trait.rs index 10a30f0a266..4514d925c82 100644 --- a/src/test/compile-fail/use-from-trait.rs +++ b/src/test/compile-fail/use-from-trait.rs @@ -14,4 +14,3 @@ impl Foo { } fn main() {} - diff --git a/src/test/run-pass/const-struct-offsets.rs b/src/test/run-pass/const-struct-offsets.rs index 0966fa055bf..cd39c8df872 100644 --- a/src/test/run-pass/const-struct-offsets.rs +++ b/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() {} - diff --git a/src/test/run-pass/issue-4735.rs b/src/test/run-pass/issue-4735.rs index e17fa217329..057622d2251 100644 --- a/src/test/run-pass/issue-4735.rs +++ b/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); } - - diff --git a/src/test/run-pass/monomorphize-abi-alignment.rs b/src/test/run-pass/monomorphize-abi-alignment.rs index 12c882a8708..f9c8fe006f3 100644 --- a/src/test/run-pass/monomorphize-abi-alignment.rs +++ b/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 = S { i: 0, t: A((13, 104)) }; - static Cb: S = S { i: 0, t: B(31337) }; - assert_eq!(*(Ca.unwrap()), (13, 104)); - assert_eq!(*(Cb.unwrap()), 31337); + static Ca: S = S { i: 0, t: A((13, 104)) }; + static Cb: S = S { i: 0, t: B(31337) }; + assert_eq!(*(Ca.unwrap()), (13, 104)); + assert_eq!(*(Cb.unwrap()), 31337); } diff --git a/src/test/run-pass/multi-let.rs b/src/test/run-pass/multi-let.rs index 8e6865adce9..eb1444be378 100644 --- a/src/test/run-pass/multi-let.rs +++ b/src/test/run-pass/multi-let.rs @@ -13,4 +13,3 @@ pub fn main() { let y = x; assert!((y == 10)); } - diff --git a/src/test/run-pass/pub-extern-privacy.rs b/src/test/run-pass/pub-extern-privacy.rs index 2927279f6a2..e0ac43f1f04 100644 --- a/src/test/run-pass/pub-extern-privacy.rs +++ b/src/test/run-pass/pub-extern-privacy.rs @@ -11,4 +11,3 @@ fn main() { a::free(transmute(0)); } } -