Skip to content

Commit 848fd0f

Browse files
borsbors
committed
---
yaml --- r: 69592 b: refs/heads/auto c: d346f1a h: refs/heads/master v: v3
1 parent 01af67a commit 848fd0f

File tree

113 files changed

+584
-2884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+584
-2884
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 3e5b058521f4057d82020f30ffafb27298b093e9
17+
refs/heads/auto: d346f1a40e0d0ebe24e60d418f304641fc26f9b0
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

‎branches/auto/doc/tutorial-tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ an intermediate generation has already exited:
548548
~~~
549549
# use std::task;
550550
# fn sleep_forever() { loop { task::yield() } }
551-
# fn wait_for_a_while() { for 1000.times { task::yield() } }
551+
# fn wait_for_a_while() { do 1000.times { task::yield() } }
552552
# do task::try::<int> {
553553
do task::spawn_supervised {
554554
do task::spawn_supervised {
@@ -567,7 +567,7 @@ other at all, using `task::spawn_unlinked` for _isolated failure_.
567567
~~~
568568
# use std::task;
569569
# fn random() -> uint { 100 }
570-
# fn sleep_for(i: uint) { for i.times { task::yield() } }
570+
# fn sleep_for(i: uint) { do i.times { task::yield() } }
571571
# do task::try::<()> {
572572
let (time1, time2) = (random(), random());
573573
do task::spawn_unlinked {

‎branches/auto/doc/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,7 @@ struct TimeBomb {
18991899
19001900
impl Drop for TimeBomb {
19011901
fn drop(&self) {
1902-
for self.explosivity.times {
1902+
do self.explosivity.times {
19031903
println("blam!");
19041904
}
19051905
}

‎branches/auto/mk/tests.mk

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# The names of crates that must be tested
1717
TEST_TARGET_CRATES = std extra
18-
TEST_HOST_CRATES = rust rusti rustpkg rustc rustdoc syntax
18+
TEST_HOST_CRATES = syntax rustc rustdoc rust rustpkg rusti
1919
TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
2020

2121
# Markdown files under doc/ that should have their code extracted and run
@@ -215,25 +215,20 @@ else
215215
ALL_CS := $(wildcard $(S)src/rt/*.cpp \
216216
$(S)src/rt/*/*.cpp \
217217
$(S)src/rt/*/*/*.cpp \
218-
$(S)srcrustllvm/*.cpp)
219-
ALL_CS := $(filter-out $(S)src/rt/bigint/bigint_ext.cpp \
220-
$(S)src/rt/bigint/bigint_int.cpp \
221-
$(S)src/rt/miniz.cpp \
218+
$(S)src/rustllvm/*.cpp)
219+
ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
222220
$(S)src/rt/linenoise/linenoise.c \
223221
$(S)src/rt/linenoise/utf8.c \
224222
,$(ALL_CS))
225223
ALL_HS := $(wildcard $(S)src/rt/*.h \
226224
$(S)src/rt/*/*.h \
227225
$(S)src/rt/*/*/*.h \
228-
$(S)srcrustllvm/*.h)
226+
$(S)src/rustllvm/*.h)
229227
ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
230228
$(S)src/rt/vg/memcheck.h \
231-
$(S)src/rt/uthash/uthash.h \
232-
$(S)src/rt/uthash/utlist.h \
233229
$(S)src/rt/msvc/typeof.h \
234230
$(S)src/rt/msvc/stdint.h \
235231
$(S)src/rt/msvc/inttypes.h \
236-
$(S)src/rt/bigint/bigint.h \
237232
$(S)src/rt/linenoise/linenoise.h \
238233
$(S)src/rt/linenoise/utf8.h \
239234
,$(ALL_HS))
@@ -352,33 +347,27 @@ $(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \
352347
$(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)): \
353348
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
354349
$$(SREQ$(1)_T_$(2)_H_$(3)) \
355-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
356350
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
357351
@$$(call E, compile_and_link: $$@)
358352
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
359353

360354
$(3)/stage$(1)/test/rustitest-$(2)$$(X_$(2)): \
361355
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
362356
$$(SREQ$(1)_T_$(2)_H_$(3)) \
363-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
364357
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
365358
@$$(call E, compile_and_link: $$@)
366359
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
367360

368361
$(3)/stage$(1)/test/rusttest-$(2)$$(X_$(2)): \
369362
$$(RUST_LIB) $$(RUST_INPUTS) \
370363
$$(SREQ$(1)_T_$(2)_H_$(3)) \
371-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG_$(2)) \
372-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC_$(2)) \
373-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI_$(2)) \
374364
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
375365
@$$(call E, compile_and_link: $$@)
376366
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
377367

378368
$(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
379369
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
380370
$$(SREQ$(1)_T_$(2)_H_$(3)) \
381-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
382371
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
383372
@$$(call E, compile_and_link: $$@)
384373
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test

‎branches/auto/src/libextra/arc.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* let numbers=vec::from_fn(100, |ind| (ind as float)*rand::random());
2424
* let shared_numbers=arc::Arc::new(numbers);
2525
*
26-
* for 10.times {
26+
* do 10.times {
2727
* let (port, chan) = stream();
2828
* chan.send(shared_numbers.clone());
2929
*
@@ -761,7 +761,7 @@ mod tests {
761761
762762
do task::spawn || {
763763
do arc2.write |num| {
764-
for 10.times {
764+
do 10.times {
765765
let tmp = *num;
766766
*num = -1;
767767
task::yield();
@@ -773,7 +773,7 @@ mod tests {
773773
774774
// Readers try to catch the writer in the act
775775
let mut children = ~[];
776-
for 5.times {
776+
do 5.times {
777777
let arc3 = (*arc).clone();
778778
let mut builder = task::task();
779779
builder.future_result(|r| children.push(r));
@@ -807,7 +807,7 @@ mod tests {
807807
808808
// Reader tasks
809809
let mut reader_convos = ~[];
810-
for 10.times {
810+
do 10.times {
811811
let ((rp1,rc1),(rp2,rc2)) = (comm::stream(),comm::stream());
812812
reader_convos.push((rc1, rp2));
813813
let arcn = (*arc).clone();
@@ -921,7 +921,7 @@ mod tests {
921921
do read_mode.read |state| {
922922
// if writer mistakenly got in, make sure it mutates state
923923
// before we assert on it
924-
for 5.times { task::yield(); }
924+
do 5.times { task::yield(); }
925925
// make sure writer didn't get in.
926926
assert!(*state);
927927
}
@@ -933,6 +933,6 @@ mod tests {
933933
// helped to expose the race nearly 100% of the time... but adding
934934
// yields in the intuitively-right locations made it even less likely,
935935
// and I wasn't sure why :( . This is a mediocre "next best" option.
936-
for 8.times { test_rw_write_cond_downgrade_read_race_helper() }
936+
do 8.times { test_rw_write_cond_downgrade_read_race_helper() }
937937
}
938938
}

‎branches/auto/src/libextra/arena.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@ impl Drop for Arena {
7272
fn drop(&self) {
7373
unsafe {
7474
destroy_chunk(&self.head);
75-
for self.chunks.each |chunk| {
75+
do self.chunks.each |chunk| {
7676
if !chunk.is_pod {
7777
destroy_chunk(chunk);
7878
}
79-
}
79+
true
80+
};
8081
}
8182
}
8283
}

‎branches/auto/src/libextra/base64.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,9 @@ mod test {
358358
use std::rand::{task_rng, random, RngUtil};
359359
use std::vec;
360360
361-
for 1000.times {
361+
do 1000.times {
362362
let v: ~[u8] = do vec::build |push| {
363-
for task_rng().gen_uint_range(1, 100).times {
363+
do task_rng().gen_uint_range(1, 100).times {
364364
push(random());
365365
}
366366
};
@@ -389,4 +389,4 @@ mod test {
389389
bh.bytes = b.len() as u64;
390390
}
391391

392-
}
392+
}

0 commit comments

Comments
 (0)