Skip to content

Commit 104e612

Browse files
committed
auto merge of #7116 : thestinger/rust/whitespace, r=luqmana
2 parents 38e0574 + ec27644 commit 104e612

24 files changed

+8
-30
lines changed

RELEASES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Version 0.7 (July 2013)
44
* ??? changes, numerous bugfixes
55

66
* Syntax changes
7-
* `#[deriving(Encodable)]`, `#[deriving(Decodable)]`
7+
* `#[deriving(Encodable)]`, `#[deriving(Decodable)]`
88

99
* Semantic changes
1010
* The `self` parameter no longer implicitly means `&'self self`,

src/etc/adb_run_wrapper.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
33
#
44

5-
# Sometimes android shell produce exitcode "1 : Text File Busy"
5+
# Sometimes android shell produce exitcode "1 : Text File Busy"
66
# Retry after $WAIT seconds, expecting resource cleaned-up
77
WAIT=10
88
PATH=$1
@@ -20,15 +20,15 @@ then
2020
while [ $L_RET -eq 1 ]
2121
do
2222
LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
23-
L_RET=$?
23+
L_RET=$?
2424
if [ $L_COUNT -gt 0 ]
2525
then
2626
/system/bin/sleep $WAIT
2727
/system/bin/sync
2828
fi
2929
L_COUNT=`expr $L_COUNT+1`
3030
done
31-
31+
3232
echo $L_RET > $PATH/$RUN.exitcode
3333

3434
fi

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,3 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
161161
}
162162
}
163163
}
164-

src/librustc/middle/effect.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,3 @@ pub fn check_crate(tcx: ty::ctxt,
154154

155155
visit::visit_crate(crate, ((), visitor))
156156
}
157-

src/libstd/core.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,3 @@ mod std {
232232
pub use str;
233233
pub use os;
234234
}
235-

src/libstd/rt/comm.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,4 +615,3 @@ mod test {
615615
}
616616
}
617617
}
618-

src/libstd/rt/io/stdio.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,3 @@ impl Writer for StdWriter {
5050

5151
fn flush(&mut self) { fail!() }
5252
}
53-

src/libstd/rt/task.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,4 +228,3 @@ mod test {
228228
}
229229
}
230230
}
231-

src/libstd/rt/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,3 @@ pub fn stress_factor() -> uint {
189189
None => 1
190190
}
191191
}
192-

src/libsyntax/ext/pipes/ast_builder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,3 @@ impl append_types for @ast::Path {
6363
}
6464
}
6565
}
66-

0 commit comments

Comments
 (0)