Skip to content

Commit 8f9bbc4

Browse files
committed
remove extra::iter
This module provided adaptors for the old internal iterator protocol, but they proved to be quite unreadable and are not generic enough to handle borrowed pointers well. Since Rust no longer defines an internal iteration protocol, I don't think there's going to be any reuse via these adaptors.
1 parent 40d11a5 commit 8f9bbc4

13 files changed

+17
-348
lines changed

doc/tutorial-tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ an intermediate generation has already exited:
544544
~~~
545545
# use std::task;
546546
# fn sleep_forever() { loop { task::yield() } }
547-
# fn wait_for_a_while() { do 1000.times { task::yield() } }
547+
# fn wait_for_a_while() { for _ in range(0, 1000u) { task::yield() } }
548548
# do task::try::<int> {
549549
do task::spawn_supervised {
550550
do task::spawn_supervised {
@@ -563,7 +563,7 @@ other at all, using `task::spawn_unlinked` for _isolated failure_.
563563
~~~
564564
# use std::task;
565565
# fn random() -> uint { 100 }
566-
# fn sleep_for(i: uint) { do i.times { task::yield() } }
566+
# fn sleep_for(i: uint) { for _ in range(0, i) { task::yield() } }
567567
# do task::try::<()> {
568568
let (time1, time2) = (random(), random());
569569
do task::spawn_unlinked {

doc/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,7 @@ struct TimeBomb {
18941894
18951895
impl Drop for TimeBomb {
18961896
fn drop(&self) {
1897-
do self.explosivity.times {
1897+
for _ in range(0, self.explosivity) {
18981898
println("blam!");
18991899
}
19001900
}

src/libextra/iter.rs

Lines changed: 0 additions & 331 deletions
This file was deleted.

src/librustdoc/markdown_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ mod test {
637637
let doc = (page_pass::mk_pass(config::DocPerMod).f)(srv, doc);
638638
write_markdown(doc, writer_factory);
639639
// We expect two pages to have been written
640-
do 2.times {
640+
for _ in range(0, 2u) {
641641
po.recv();
642642
}
643643
}
@@ -649,7 +649,7 @@ mod test {
649649
~"#[link(name = \"core\")]; mod a { }");
650650
let doc = (page_pass::mk_pass(config::DocPerMod).f)(srv, doc);
651651
write_markdown(doc, writer_factory);
652-
do 2.times {
652+
for _ in range(0, 2u) {
653653
let (page, markdown) = po.recv();
654654
match page {
655655
doc::CratePage(_) => {

src/test/bench/core-set.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl Results {
5959
{
6060
let mut set = f();
6161
do timed(&mut self.random_ints) {
62-
do num_keys.times {
62+
for _ in range(0, num_keys) {
6363
set.insert((rng.next() as uint) % rand_cap);
6464
}
6565
}
@@ -103,7 +103,7 @@ impl Results {
103103
{
104104
let mut set = f();
105105
do timed(&mut self.random_strings) {
106-
do num_keys.times {
106+
for _ in range(0, num_keys) {
107107
let s = uint::to_str(rng.next() as uint);
108108
set.insert(s);
109109
}

0 commit comments

Comments
 (0)