Skip to content

Commit 8d10fb6

Browse files
borsbors
committed
---
yaml --- r: 152291 b: refs/heads/try2 c: ae95770 h: refs/heads/master i: 152289: df53936 152287: 5b35f76 v: v3
1 parent e9aeb9a commit 8d10fb6

File tree

170 files changed

+1493
-1176
lines changed

Some content is hidden

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

170 files changed

+1493
-1176
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: 7e0cc34d629937e739ebf4404e5fe99c70d4b364
8+
refs/heads/try2: ae9577052d99203806fd83c84669d25fbe0af367
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/mk/docs.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ HTML_DEPS += doc/version_info.html
110110
doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
111111
$(wildcard $(D)/*.*) | doc/
112112
@$(call E, version-info: $@)
113-
sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
113+
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
114114
$(CFG_VER_HASH) | head -c 8)/;\
115115
s/STAMP/$(CFG_VER_HASH)/;" $< >$@
116116

@@ -156,15 +156,17 @@ doc/footer.tex: $(D)/footer.inc | doc/
156156
# HTML (rustdoc)
157157
DOC_TARGETS += doc/not_found.html
158158
doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
159-
$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://doc.rust-lang.org/rust.css $<
159+
@$(call E, rustdoc: $@)
160+
$(Q)$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) \
161+
--markdown-css http://doc.rust-lang.org/rust.css $<
160162

161163
define DEF_DOC
162164

163165
# HTML (rustdoc)
164166
DOC_TARGETS += doc/$(1).html
165167
doc/$(1).html: $$(D)/$(1).md $$(HTML_DEPS) $$(RUSTDOC_DEPS_$(1)) | doc/
166168
@$$(call E, rustdoc: $$@)
167-
$$(RUSTDOC) $$(RUSTDOC_HTML_OPTS) $$(RUSTDOC_FLAGS_$(1)) $$<
169+
$$(Q)$$(RUSTDOC) $$(RUSTDOC_HTML_OPTS) $$(RUSTDOC_FLAGS_$(1)) $$<
168170

169171
ifneq ($(ONLY_HTML_DOCS),1)
170172

‎branches/try2/src/compiletest/runtest.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
361361
],
362362
vec!(("".to_string(), "".to_string())),
363363
Some("".to_string()))
364-
.expect(format!("failed to exec `{}`", config.adb_path));
364+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
365365

366366
procsrv::run("",
367367
config.adb_path.as_slice(),
@@ -372,7 +372,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
372372
],
373373
vec!(("".to_string(), "".to_string())),
374374
Some("".to_string()))
375-
.expect(format!("failed to exec `{}`", config.adb_path));
375+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
376376

377377
let adb_arg = format!("export LD_LIBRARY_PATH={}; \
378378
gdbserver :5039 {}/{}",
@@ -392,7 +392,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
392392
vec!(("".to_string(),
393393
"".to_string())),
394394
Some("".to_string()))
395-
.expect(format!("failed to exec `{}`", config.adb_path));
395+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
396396
loop {
397397
//waiting 1 second for gdbserver start
398398
timer::sleep(1000);
@@ -428,7 +428,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
428428
debugger_opts.as_slice(),
429429
vec!(("".to_string(), "".to_string())),
430430
None)
431-
.expect(format!("failed to exec `{}`", gdb_path));
431+
.expect(format!("failed to exec `{}`", gdb_path).as_slice());
432432
let cmdline = {
433433
let cmdline = make_cmdline("",
434434
"arm-linux-androideabi-gdb",
@@ -1207,7 +1207,7 @@ fn program_output(config: &Config, testfile: &Path, lib_path: &str, prog: String
12071207
prog.as_slice(),
12081208
args.as_slice(),
12091209
env,
1210-
input).expect(format!("failed to exec `{}`", prog));
1210+
input).expect(format!("failed to exec `{}`", prog).as_slice());
12111211
dump_output(config, testfile, out.as_slice(), err.as_slice());
12121212
return ProcRes {
12131213
status: status,
@@ -1333,7 +1333,7 @@ fn _arm_exec_compiled_test(config: &Config,
13331333
],
13341334
vec!(("".to_string(), "".to_string())),
13351335
Some("".to_string()))
1336-
.expect(format!("failed to exec `{}`", config.adb_path));
1336+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
13371337

13381338
if config.verbose {
13391339
println!("push ({}) {} {} {}",
@@ -1363,7 +1363,7 @@ fn _arm_exec_compiled_test(config: &Config,
13631363
config.adb_path.as_slice(),
13641364
runargs.as_slice(),
13651365
vec!(("".to_string(), "".to_string())), Some("".to_string()))
1366-
.expect(format!("failed to exec `{}`", config.adb_path));
1366+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
13671367

13681368
// get exitcode of result
13691369
runargs = Vec::new();
@@ -1377,7 +1377,7 @@ fn _arm_exec_compiled_test(config: &Config,
13771377
runargs.as_slice(),
13781378
vec!(("".to_string(), "".to_string())),
13791379
Some("".to_string()))
1380-
.expect(format!("failed to exec `{}`", config.adb_path));
1380+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
13811381

13821382
let mut exitcode: int = 0;
13831383
for c in exitcode_out.as_slice().chars() {
@@ -1400,7 +1400,7 @@ fn _arm_exec_compiled_test(config: &Config,
14001400
runargs.as_slice(),
14011401
vec!(("".to_string(), "".to_string())),
14021402
Some("".to_string()))
1403-
.expect(format!("failed to exec `{}`", config.adb_path));
1403+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
14041404

14051405
// get stderr of result
14061406
runargs = Vec::new();
@@ -1414,7 +1414,7 @@ fn _arm_exec_compiled_test(config: &Config,
14141414
runargs.as_slice(),
14151415
vec!(("".to_string(), "".to_string())),
14161416
Some("".to_string()))
1417-
.expect(format!("failed to exec `{}`", config.adb_path));
1417+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
14181418

14191419
dump_output(config,
14201420
testfile,
@@ -1448,7 +1448,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) {
14481448
vec!(("".to_string(),
14491449
"".to_string())),
14501450
Some("".to_string()))
1451-
.expect(format!("failed to exec `{}`", config.adb_path));
1451+
.expect(format!("failed to exec `{}`", config.adb_path).as_slice());
14521452

14531453
if config.verbose {
14541454
println!("push ({}) {} {} {}",

‎branches/try2/src/doc/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ li {list-style-type: none; }
6161
* [The `time` library](time/index.html)
6262
* [The `uuid` 128-bit universally unique identifier library](uuid/index.html)
6363
* [The `url` library](url/index.html)
64-
* [The `workcache` library](workcache/index.html)
6564
* [The `log` library](log/index.html)
6665

6766
# Tooling

‎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;

0 commit comments

Comments
 (0)