Skip to content

Commit c79a983

Browse files
author
Philipp Brueschweiler
committed
---
yaml --- r: 63341 b: refs/heads/snap-stage3 c: c7013ba h: refs/heads/master i: 63339: a675c41 v: v3
1 parent e527320 commit c79a983

File tree

159 files changed

+611
-398
lines changed

Some content is hidden

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

159 files changed

+611
-398
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 83d44f87e5fe8935c1f8a5f26409a99286675650
4+
refs/heads/snap-stage3: c7013ba1fcad7fcc84d7e6e93d7a0306c13bce47
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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`,

branches/snap-stage3/doc/tutorial-tasks.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ fn main() {
327327
let mut futures = vec::from_fn(1000, |ind| do extra::future::spawn { partial_sum(ind) });
328328
329329
let mut final_res = 0f64;
330-
for futures.mut_iter().advance |ft| {
330+
for futures.each_mut |ft| {
331331
final_res += ft.get();
332332
}
333333
println(fmt!("π^2/6 is not far from : %?", final_res));
@@ -351,6 +351,7 @@ a single large vector of floats. Each task needs the full vector to perform its
351351
# use std::vec;
352352
# use std::uint;
353353
# use std::rand;
354+
# use std::iterator::IteratorUtil;
354355
use extra::arc::ARC;
355356
356357
fn pnorm(nums: &~[float], p: uint) -> float {

branches/snap-stage3/src/compiletest/header.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use core::prelude::*;
1313
use common::config;
1414
use common;
1515

16+
use core::iterator::IteratorUtil;
1617
use core::io;
1718
use core::os;
1819

branches/snap-stage3/src/compiletest/procsrv.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
use core::prelude::*;
12+
use core::iterator::IteratorUtil;
1213

1314
use core::os;
1415
use core::run;

branches/snap-stage3/src/compiletest/runtest.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use procsrv;
2222
use util;
2323
use util::logv;
2424

25+
use core::iterator::IteratorUtil;
2526
use core::io;
2627
use core::os;
2728
use core::str;

branches/snap-stage3/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

branches/snap-stage3/src/libextra/deque.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl<T> Container for Deque<T> {
3737
impl<T> Mutable for Deque<T> {
3838
/// Clear the deque, removing all values.
3939
fn clear(&mut self) {
40-
for self.elts.mut_iter().advance |x| { *x = None }
40+
for self.elts.each_mut |x| { *x = None }
4141
self.nelts = 0;
4242
self.lo = 0;
4343
self.hi = 0;

branches/snap-stage3/src/libextra/dlist.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
2020

2121
use core::prelude::*;
2222

23+
use core::iterator::IteratorUtil;
2324
use core::managed;
2425
use core::old_iter;
2526
use core::vec;

branches/snap-stage3/src/libextra/fileinput.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ mod test {
414414
415415
use super::{FileInput, pathify, input_vec, input_vec_state};
416416
417+
use core::iterator::IteratorUtil;
417418
use core::io;
418419
use core::uint;
419420
use core::vec;

branches/snap-stage3/src/libextra/getopts.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383

8484
use core::prelude::*;
8585

86+
use core::iterator::IteratorUtil;
8687
use core::cmp::Eq;
8788
use core::result::{Err, Ok};
8889
use core::result;

branches/snap-stage3/src/libextra/json.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
1919
use core::prelude::*;
2020

21+
use core::iterator::IteratorUtil;
2122
use core::char;
2223
use core::float;
2324
use core::hashmap::HashMap;

branches/snap-stage3/src/libextra/list.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
1313
use core::prelude::*;
1414

15+
use core::iterator::IteratorUtil;
1516

1617
#[deriving(Eq)]
1718
pub enum List<T> {

branches/snap-stage3/src/libextra/net_ip.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
use core::prelude::*;
1616

17+
use core::iterator::IteratorUtil;
1718
use core::libc;
1819
use core::comm::{stream, SharedChan};
1920
use core::ptr;

branches/snap-stage3/src/libextra/net_url.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
use core::prelude::*;
1616

17+
use core::iterator::IteratorUtil;
1718
use core::cmp::Eq;
1819
use core::io::{Reader, ReaderUtil};
1920
use core::io;

branches/snap-stage3/src/libextra/num/bigint.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ A BigInt is a combination of BigUint and Sign.
1919
#[allow(missing_doc)];
2020

2121
use core::prelude::*;
22+
use core::iterator::IteratorUtil;
2223
use core::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
2324
use core::int;
2425
use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix, Orderable};

branches/snap-stage3/src/libextra/num/rational.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
1313
use core::prelude::*;
1414

15+
use core::iterator::IteratorUtil;
1516
use core::cmp;
1617
use core::from_str::FromStr;
1718
use core::num::{Zero,One,ToStrRadix,FromStrRadix,Round};

branches/snap-stage3/src/libextra/par.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
use core::prelude::*;
1212

13+
use core::iterator::IteratorUtil;
1314
use core::cast;
1415
use core::ptr;
1516
use core::sys;

branches/snap-stage3/src/libextra/rope.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
use core::prelude::*;
3939

40+
use core::iterator::IteratorUtil;
4041
use core::uint;
4142
use core::vec;
4243
use core::str;

branches/snap-stage3/src/libextra/semver.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
use core::prelude::*;
1616

17+
use core::iterator::IteratorUtil;
1718
use core::char;
1819
use core::cmp;
1920
use core::io::{ReaderUtil};

branches/snap-stage3/src/libextra/sha1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
use core::prelude::*;
2626

27-
use core::str;
27+
use core::iterator::IteratorUtil;
2828
use core::uint;
2929
use core::vec;
3030

branches/snap-stage3/src/libextra/stats.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
use core::prelude::*;
1414

15-
use core::vec;
15+
use core::iterator::*;
1616
use core::f64;
1717
use core::cmp;
1818
use core::num;

branches/snap-stage3/src/libextra/terminfo/parser/compiled.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use core::prelude::*;
1414

1515
use core::{vec, int, str};
1616
use core::io::Reader;
17+
use core::iterator::IteratorUtil;
1718
use core::hashmap::HashMap;
1819
use super::super::TermInfo;
1920

branches/snap-stage3/src/libextra/terminfo/searcher.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use core::prelude::*;
1515
use core::{os, str};
1616
use core::os::getenv;
1717
use core::io::{file_reader, Reader};
18+
use core::iterator::IteratorUtil;
1819
use path = core::path::Path;
1920

2021
/// Return path to database entry for `term`

branches/snap-stage3/src/libextra/time.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ use core::i32;
1616
use core::int;
1717
use core::io;
1818
use core::str;
19+
use core::iterator::IteratorUtil;
1920

2021
static NSEC_PER_SEC: i32 = 1_000_000_000_i32;
2122

branches/snap-stage3/src/libextra/treemap.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
1515
use core::prelude::*;
1616

17+
use core::iterator::*;
1718
use core::uint;
1819
use core::util::{swap, replace};
1920

@@ -708,6 +709,7 @@ mod test_treemap {
708709

709710
use super::*;
710711

712+
use core::iterator::*;
711713
use core::rand::RngUtil;
712714
use core::rand;
713715
use core::str;
@@ -1028,6 +1030,7 @@ mod test_treemap {
10281030
#[cfg(test)]
10291031
mod test_set {
10301032
use core::prelude::*;
1033+
use core::iterator::*;
10311034

10321035
use super::*;
10331036

branches/snap-stage3/src/librust/rust.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ extern mod rusti;
3030
extern mod rustc;
3131

3232
use core::prelude::*;
33+
use core::iterator::IteratorUtil;
3334

3435
use core::io;
3536
use core::os;

0 commit comments

Comments
 (0)