Skip to content

Commit daaf73f

Browse files
committed
---
yaml --- r: 152293 b: refs/heads/try2 c: 100ff4c h: refs/heads/master i: 152291: 8d10fb6 v: v3
1 parent 7b9de14 commit daaf73f

File tree

158 files changed

+1347
-934
lines changed

Some content is hidden

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

158 files changed

+1347
-934
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: ec8ef0d24d5d38dd4c841d06ee2c72b7c64e5a6f
8+
refs/heads/try2: 100ff4cf30d764552b36270c9f8e04373fd6e468
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ script: |
4040
if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi
4141
fi &&
4242
make tidy &&
43-
make -j4 rustc-stage1 &&
43+
travis_wait make -j4 rustc-stage1 &&
4444
make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
4545
4646
env:

branches/try2/mk/crates.mk

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,36 +60,36 @@ DEPS_core :=
6060
DEPS_rlibc :=
6161
DEPS_alloc := core libc native:jemalloc
6262
DEPS_debug := std
63-
DEPS_std := core rand libc alloc native:rustrt native:backtrace
63+
DEPS_std := core rand libc alloc collections native:rustrt native:backtrace
6464
DEPS_graphviz := std
6565
DEPS_green := std native:context_switch
6666
DEPS_rustuv := std native:uv native:uv_support
6767
DEPS_native := std
68-
DEPS_syntax := std term serialize collections log fmt_macros debug
68+
DEPS_syntax := std term serialize log fmt_macros debug
6969
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
70-
collections time log graphviz debug
71-
DEPS_rustdoc := rustc native:hoedown serialize sync getopts collections \
70+
time log graphviz debug
71+
DEPS_rustdoc := rustc native:hoedown serialize sync getopts \
7272
test time debug
7373
DEPS_flate := std native:miniz
74-
DEPS_arena := std collections
74+
DEPS_arena := std
7575
DEPS_graphviz := std
7676
DEPS_glob := std
77-
DEPS_serialize := std collections log
78-
DEPS_term := std collections log
77+
DEPS_serialize := std log
78+
DEPS_term := std log
7979
DEPS_semver := std
8080
DEPS_uuid := std serialize
8181
DEPS_sync := std alloc
8282
DEPS_getopts := std
83-
DEPS_collections := std debug
83+
DEPS_collections := core alloc
8484
DEPS_fourcc := syntax std
8585
DEPS_hexfloat := syntax std
8686
DEPS_num := std
87-
DEPS_test := std collections getopts serialize term time regex
87+
DEPS_test := std getopts serialize term time regex
8888
DEPS_time := std serialize sync
8989
DEPS_rand := core
90-
DEPS_url := std collections
90+
DEPS_url := std
9191
DEPS_log := std sync
92-
DEPS_regex := std collections
92+
DEPS_regex := std
9393
DEPS_regex_macros = syntax std regex
9494
DEPS_fmt_macros = std
9595

@@ -105,6 +105,7 @@ ONLY_RLIB_libc := 1
105105
ONLY_RLIB_rlibc := 1
106106
ONLY_RLIB_alloc := 1
107107
ONLY_RLIB_rand := 1
108+
ONLY_RLIB_collections := 1
108109

109110
################################################################################
110111
# You should not need to edit below this line

branches/try2/src/doc/guide-lifetimes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Despite their complete safety, a reference's representation at runtime
1414
is the same as that of an ordinary pointer in a C program. They introduce zero
1515
overhead. The compiler does all safety checks at compile time.
1616

17-
Although references have rather elaborate theoretical underpinnings usually
18-
introduced as (e.g. region pointers), the core concepts will be familiar to
19-
anyone who has worked with C or C++. The best way to explain how they are
17+
Although references have rather elaborate theoretical underpinnings
18+
(e.g. region pointers), the core concepts will be familiar to anyone
19+
who has worked with C or C++. The best way to explain how they are
2020
used—and their limitations—is probably just to work through several examples.
2121

2222
# By example

branches/try2/src/doc/tutorial.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2058,8 +2058,7 @@ illegal to copy and pass by value.
20582058
Generic `type`, `struct`, and `enum` declarations follow the same pattern:
20592059

20602060
~~~~
2061-
extern crate collections;
2062-
type Set<T> = collections::HashMap<T, ()>;
2061+
type Set<T> = std::collections::HashMap<T, ()>;
20632062
20642063
struct Stack<T> {
20652064
elements: Vec<T>

branches/try2/src/libarena/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
html_root_url = "http://doc.rust-lang.org/")]
2929
#![allow(missing_doc)]
3030

31-
extern crate collections;
32-
3331
use std::cell::{Cell, RefCell};
3432
use std::cmp;
3533
use std::intrinsics::{TyDesc, get_tydesc};

branches/try2/src/libcollections/bitv.rs

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010

1111
#![allow(missing_doc)]
1212

13+
use core::prelude::*;
1314

14-
use std::cmp;
15-
use std::fmt;
16-
use std::iter::RandomAccessIterator;
17-
use std::iter::{Enumerate, Repeat, Map, Zip};
18-
use std::ops;
19-
use std::slice;
20-
use std::uint;
15+
use core::cmp;
16+
use core::fmt;
17+
use core::iter::{Enumerate, Repeat, Map, Zip};
18+
use core::ops;
19+
use core::slice;
20+
use core::uint;
21+
22+
use vec::Vec;
2123

2224
#[deriving(Clone)]
2325
struct SmallBitv {
@@ -977,26 +979,26 @@ impl<'a> Iterator<uint> for BitPositions<'a> {
977979

978980
#[cfg(test)]
979981
mod tests {
980-
extern crate test;
981-
use self::test::Bencher;
982+
use std::prelude::*;
983+
use std::uint;
984+
use std::rand;
985+
use std::rand::Rng;
986+
use test::Bencher;
982987

983988
use bitv::{Bitv, SmallBitv, BigBitv, BitvSet, from_bools, from_fn,
984989
from_bytes};
985990
use bitv;
986-
987-
use std::uint;
988-
use std::rand;
989-
use std::rand::Rng;
991+
use vec::Vec;
990992

991993
static BENCH_BITS : uint = 1 << 14;
992994

993995
#[test]
994996
fn test_to_str() {
995997
let zerolen = Bitv::new(0u, false);
996-
assert_eq!(zerolen.to_str(), "".to_string());
998+
assert_eq!(zerolen.to_str().as_slice(), "");
997999

9981000
let eightbits = Bitv::new(8u, false);
999-
assert_eq!(eightbits.to_str(), "00000000".to_string());
1001+
assert_eq!(eightbits.to_str().as_slice(), "00000000")
10001002
}
10011003

10021004
#[test]
@@ -1019,7 +1021,7 @@ mod tests {
10191021
let mut b = bitv::Bitv::new(2, false);
10201022
b.set(0, true);
10211023
b.set(1, false);
1022-
assert_eq!(b.to_str(), "10".to_string());
1024+
assert_eq!(b.to_str().as_slice(), "10");
10231025
}
10241026

10251027
#[test]
@@ -1330,7 +1332,7 @@ mod tests {
13301332
fn test_from_bytes() {
13311333
let bitv = from_bytes([0b10110110, 0b00000000, 0b11111111]);
13321334
let str = format!("{}{}{}", "10110110", "00000000", "11111111");
1333-
assert_eq!(bitv.to_str(), str);
1335+
assert_eq!(bitv.to_str().as_slice(), str.as_slice());
13341336
}
13351337

13361338
#[test]
@@ -1347,8 +1349,8 @@ mod tests {
13471349

13481350
#[test]
13491351
fn test_from_bools() {
1350-
assert!(from_bools([true, false, true, true]).to_str() ==
1351-
"1011".to_string());
1352+
assert!(from_bools([true, false, true, true]).to_str().as_slice() ==
1353+
"1011");
13521354
}
13531355

13541356
#[test]

branches/try2/src/libcollections/btree.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@
1818
///a length (the height of the tree), and lower and upper bounds on the
1919
///number of elements that a given node can contain.
2020
21-
use std::fmt;
22-
use std::fmt::Show;
21+
use core::prelude::*;
22+
23+
use alloc::owned::Box;
24+
use core::fmt;
25+
use core::fmt::Show;
26+
27+
use vec::Vec;
2328

2429
#[allow(missing_doc)]
2530
pub struct BTree<K, V> {
@@ -772,6 +777,7 @@ impl<K: fmt::Show + Ord, V: fmt::Show> fmt::Show for BranchElt<K, V> {
772777

773778
#[cfg(test)]
774779
mod test_btree {
780+
use std::prelude::*;
775781

776782
use super::{BTree, Node, LeafElt};
777783

branches/try2/src/libcollections/deque.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
//! Container traits for collections
1212
13-
use std::container::Mutable;
13+
use core::prelude::*;
1414

1515
/// A double-ended sequence that allows querying, insertion and deletion at both ends.
1616
pub trait Deque<T> : Mutable {
@@ -41,11 +41,10 @@ pub trait Deque<T> : Mutable {
4141

4242
#[cfg(test)]
4343
pub mod bench {
44-
extern crate test;
45-
use self::test::Bencher;
46-
use std::container::MutableMap;
44+
use std::prelude::*;
4745
use std::rand;
4846
use std::rand::Rng;
47+
use test::Bencher;
4948

5049
pub fn insert_rand_n<M:MutableMap<uint,uint>>(n: uint,
5150
map: &mut M,

branches/try2/src/libcollections/dlist.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@
2121
// Backlinks over DList::prev are raw pointers that form a full chain in
2222
// the reverse direction.
2323

24-
use std::iter;
25-
use std::mem;
26-
use std::ptr;
24+
use core::prelude::*;
25+
26+
use alloc::owned::Box;
27+
use core::iter;
28+
use core::mem;
29+
use core::ptr;
2730

2831
use deque::Deque;
2932

@@ -607,11 +610,14 @@ impl<A: Clone> Clone for DList<A> {
607610

608611
#[cfg(test)]
609612
mod tests {
610-
extern crate test;
611-
use self::test::Bencher;
612-
use deque::Deque;
613+
use std::prelude::*;
613614
use std::rand;
615+
use test::Bencher;
616+
use test;
617+
618+
use deque::Deque;
614619
use super::{DList, Node, ListInsertion};
620+
use vec::Vec;
615621

616622
pub fn check_links<T>(list: &DList<T>) {
617623
let mut len = 0u;

branches/try2/src/libcollections/enum_set.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
//! This module defines a container which uses an efficient bit mask
1414
//! representation to hold C-like enum variants.
1515
16-
use std::num::Bitwise;
16+
use core::prelude::*;
17+
18+
use core::num::Bitwise;
1719

1820
#[deriving(Clone, PartialEq, Eq, Hash, Show)]
1921
/// A specialized Set implementation to use enum types.
@@ -136,7 +138,7 @@ impl<E:CLike> Iterator<E> for Items<E> {
136138

137139
#[cfg(test)]
138140
mod test {
139-
141+
use std::prelude::*;
140142
use std::mem;
141143

142144
use enum_set::{EnumSet, CLike};

0 commit comments

Comments
 (0)