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

This commit is contained in:
bors 2013-06-14 19:25:05 -07:00
commit 104e6120b1
24 changed files with 8 additions and 30 deletions

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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