Skip to content

Commit 67f7e9e

Browse files
adrientetaradrientetar
committed
---
yaml --- r: 98210 b: refs/heads/master c: b2cac49 h: refs/heads/master v: v3
1 parent 5f72f67 commit 67f7e9e

Some content is hidden

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

95 files changed

+910
-1008
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: bf07c80838e59cb21748f7e3b092ced96f41a208
2+
refs/heads/master: b2cac497e8989fb6d26c1f20441e8354950bbcc3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
55
refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

‎trunk/doc/complement-cheatsheet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ let reader : File = File::open(&path).unwrap_or_else(on_error);
6262
Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](http://static.rust-lang.org/doc/master/std/io/buffered/struct.BufferedReader.html).
6363

6464
~~~
65-
use std::io::BufferedReader;
66-
# use std::io::MemReader;
65+
use std::io::buffered::BufferedReader;
66+
# use std::io::mem::MemReader;
6767
6868
# let reader = MemReader::new(~[]);
6969

‎trunk/doc/guide-conditions.md

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@ An example program that does this task reads like this:
4646
~~~~
4747
# #[allow(unused_imports)];
4848
# extern mod extra;
49-
use std::io::{BufferedReader, File};
49+
use std::io::buffered::BufferedReader;
50+
use std::io::File;
5051
# mod BufferedReader {
5152
# use std::io::File;
52-
# use std::io::MemReader;
53-
# use std::io::BufferedReader;
53+
# use std::io::mem::MemReader;
54+
# use std::io::buffered::BufferedReader;
5455
# static s : &'static [u8] = bytes!("1 2\n\
5556
# 34 56\n\
5657
# 789 123\n\
@@ -244,12 +245,13 @@ and trapping its exit status using `task::try`:
244245
~~~~
245246
# #[allow(unused_imports)];
246247
# extern mod extra;
247-
use std::io::{BufferedReader, File};
248+
use std::io::buffered::BufferedReader;
249+
use std::io::File;
248250
use std::task;
249251
# mod BufferedReader {
250252
# use std::io::File;
251-
# use std::io::MemReader;
252-
# use std::io::BufferedReader;
253+
# use std::io::mem::MemReader;
254+
# use std::io::buffered::BufferedReader;
253255
# static s : &'static [u8] = bytes!("1 2\n\
254256
# 34 56\n\
255257
# 789 123\n\
@@ -348,11 +350,12 @@ but similarly clear as the version that used `fail!` in the logic where the erro
348350
~~~~
349351
# #[allow(unused_imports)];
350352
# extern mod extra;
351-
use std::io::{BufferedReader, File};
353+
use std::io::buffered::BufferedReader;
354+
use std::io::File;
352355
# mod BufferedReader {
353356
# use std::io::File;
354-
# use std::io::MemReader;
355-
# use std::io::BufferedReader;
357+
# use std::io::mem::MemReader;
358+
# use std::io::buffered::BufferedReader;
356359
# static s : &'static [u8] = bytes!("1 2\n\
357360
# 34 56\n\
358361
# 789 123\n\
@@ -417,11 +420,12 @@ and replaces bad input lines with the pair `(-1,-1)`:
417420
~~~~
418421
# #[allow(unused_imports)];
419422
# extern mod extra;
420-
use std::io::{BufferedReader, File};
423+
use std::io::buffered::BufferedReader;
424+
use std::io::File;
421425
# mod BufferedReader {
422426
# use std::io::File;
423-
# use std::io::MemReader;
424-
# use std::io::BufferedReader;
427+
# use std::io::mem::MemReader;
428+
# use std::io::buffered::BufferedReader;
425429
# static s : &'static [u8] = bytes!("1 2\n\
426430
# 34 56\n\
427431
# 789 123\n\
@@ -492,11 +496,12 @@ Changing the condition's return type from `(int,int)` to `Option<(int,int)>` wil
492496
~~~~
493497
# #[allow(unused_imports)];
494498
# extern mod extra;
495-
use std::io::{BufferedReader, File};
499+
use std::io::buffered::BufferedReader;
500+
use std::io::File;
496501
# mod BufferedReader {
497502
# use std::io::File;
498-
# use std::io::MemReader;
499-
# use std::io::BufferedReader;
503+
# use std::io::mem::MemReader;
504+
# use std::io::buffered::BufferedReader;
500505
# static s : &'static [u8] = bytes!("1 2\n\
501506
# 34 56\n\
502507
# 789 123\n\
@@ -577,11 +582,12 @@ This can be encoded in the handler API by introducing a helper type: `enum Malfo
577582
~~~~
578583
# #[allow(unused_imports)];
579584
# extern mod extra;
585+
use std::io::buffered::BufferedReader;
580586
use std::io::File;
581587
# mod BufferedReader {
582588
# use std::io::File;
583-
# use std::io::MemReader;
584-
# use std::io::BufferedReader;
589+
# use std::io::mem::MemReader;
590+
# use std::io::buffered::BufferedReader;
585591
# static s : &'static [u8] = bytes!("1 2\n\
586592
# 34 56\n\
587593
# 789 123\n\
@@ -701,11 +707,12 @@ a second condition and a helper function will suffice:
701707
~~~~
702708
# #[allow(unused_imports)];
703709
# extern mod extra;
704-
use std::io::{BufferedReader, File};
710+
use std::io::buffered::BufferedReader;
711+
use std::io::File;
705712
# mod BufferedReader {
706713
# use std::io::File;
707-
# use std::io::MemReader;
708-
# use std::io::BufferedReader;
714+
# use std::io::mem::MemReader;
715+
# use std::io::buffered::BufferedReader;
709716
# static s : &'static [u8] = bytes!("1 2\n\
710717
# 34 56\n\
711718
# 789 123\n\

‎trunk/doc/guide-tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ be distributed on the available cores.
290290
fn partial_sum(start: uint) -> f64 {
291291
let mut local_sum = 0f64;
292292
for num in range(start*100000, (start+1)*100000) {
293-
local_sum += (num as f64 + 1.0).powf(&-2.0);
293+
local_sum += (num as f64 + 1.0).pow(&-2.0);
294294
}
295295
local_sum
296296
}
@@ -326,7 +326,7 @@ a single large vector of floats. Each task needs the full vector to perform its
326326
use extra::arc::Arc;
327327
328328
fn pnorm(nums: &~[f64], p: uint) -> f64 {
329-
nums.iter().fold(0.0, |a,b| a+(*b).powf(&(p as f64)) ).powf(&(1.0 / (p as f64)))
329+
nums.iter().fold(0.0, |a,b| a+(*b).pow(&(p as f64)) ).pow(&(1.0 / (p as f64)))
330330
}
331331
332332
fn main() {

‎trunk/doc/guide-testing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ mod tests {
6363
}
6464
~~~
6565

66-
Additionally `#[test]` items behave as if they also have the
67-
`#[cfg(test)]` attribute, and will not be compiled when the --test flag
66+
Additionally #[test] items behave as if they also have the
67+
#[cfg(test)] attribute, and will not be compiled when the --test flag
6868
is not used.
6969

7070
Tests that should not be run can be annotated with the 'ignore'

‎trunk/mk/docs.mk

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ CDOCS :=
1717
DOCS_L10N :=
1818
HTML_DEPS :=
1919

20-
BASE_DOC_OPTS := --include-before-body=doc/version_info.html --standalone \
21-
--toc --number-sections
22-
HTML_OPTS = $(BASE_DOC_OPTS) --to=html5 --section-divs --css=rust.css \
23-
--include-in-header=doc/favicon.inc
24-
TEX_OPTS = $(BASE_DOC_OPTS) --to=latex
20+
BASE_DOC_OPTS := --standalone --toc --number-sections
21+
HTML_OPTS = $(BASE_DOC_OPTS) --to=html5 --section-divs --css=rust.css \
22+
--include-before-body=doc/version_info.html --include-in-header=doc/favicon.inc
23+
TEX_OPTS = $(BASE_DOC_OPTS) --include-before-body=doc/version.md --to=latex
2524
EPUB_OPTS = $(BASE_DOC_OPTS) --to=epub
2625

2726
######################################################################
2827
# Rust version
2928
######################################################################
29+
3030
doc/version.md: $(MKFILE_DEPS) $(wildcard $(S)doc/*.*)
3131
@$(call E, version-stamp: $@)
3232
$(Q)echo "$(CFG_VERSION)" >$@
@@ -84,7 +84,7 @@ doc/rust.tex: rust.md doc/version.md
8484
$(CFG_PANDOC) $(TEX_OPTS) --output=$@
8585

8686
DOCS += doc/rust.epub
87-
doc/rust.epub: rust.md doc/version_info.html doc/rust.css
87+
doc/rust.epub: rust.md
8888
@$(call E, pandoc: $@)
8989
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
9090
$(CFG_PANDOC) $(EPUB_OPTS) --output=$@
@@ -114,7 +114,7 @@ doc/tutorial.tex: tutorial.md doc/version.md
114114
$(CFG_PANDOC) $(TEX_OPTS) --output=$@
115115

116116
DOCS += doc/tutorial.epub
117-
doc/tutorial.epub: tutorial.md doc/version_info.html doc/rust.css
117+
doc/tutorial.epub: tutorial.md
118118
@$(call E, pandoc: $@)
119119
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
120120
$(CFG_PANDOC) $(EPUB_OPTS) --output=$@
@@ -265,6 +265,7 @@ endif # No pandoc / node
265265
######################################################################
266266
# LLnextgen (grammar analysis from refman)
267267
######################################################################
268+
268269
ifeq ($(CFG_LLNEXTGEN),)
269270
$(info cfg: no llnextgen found, omitting grammar-verification)
270271
else

‎trunk/mk/tests.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,10 +626,9 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
626626
--aux-base $$(S)src/test/auxiliary/ \
627627
--stage-id stage$(1)-$(2) \
628628
--target $(2) \
629-
--host $(3) \
630629
--adb-path=$(CFG_ADB) \
631630
--adb-test-dir=$(CFG_ADB_TEST_DIR) \
632-
--rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS)" \
631+
--rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) --target=$(2)" \
633632
$$(CTEST_TESTARGS)
634633

635634
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)

‎trunk/src/compiletest/common.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ pub struct config {
8686
// Target system to be tested
8787
target: ~str,
8888

89-
// Host triple for the compiler being invoked
90-
host: ~str,
91-
9289
// Extra parameter to run adb on arm-linux-androideabi
9390
adb_path: ~str,
9491

‎trunk/src/compiletest/compiletest.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ pub fn parse_config(args: ~[~str]) -> config {
7373
"percent change in metrics to consider noise", "N"),
7474
optflag("", "jit", "run tests under the JIT"),
7575
optopt("", "target", "the target to build for", "TARGET"),
76-
optopt("", "host", "the host to build for", "HOST"),
7776
optopt("", "adb-path", "path to the android debugger", "PATH"),
7877
optopt("", "adb-test-dir", "path to tests for the android debugger", "PATH"),
7978
optopt("", "test-shard", "run shard A, of B shards, worth of the testsuite", "A.B"),
@@ -135,7 +134,6 @@ pub fn parse_config(args: ~[~str]) -> config {
135134
rustcflags: matches.opt_str("rustcflags"),
136135
jit: matches.opt_present("jit"),
137136
target: opt_str2(matches.opt_str("target")).to_str(),
138-
host: opt_str2(matches.opt_str("host")).to_str(),
139137
adb_path: opt_str2(matches.opt_str("adb-path")).to_str(),
140138
adb_test_dir:
141139
opt_str2(matches.opt_str("adb-test-dir")).to_str(),
@@ -169,7 +167,6 @@ pub fn log_config(config: &config) {
169167
logv(c, format!("rustcflags: {}", opt_str(&config.rustcflags)));
170168
logv(c, format!("jit: {}", config.jit));
171169
logv(c, format!("target: {}", config.target));
172-
logv(c, format!("host: {}", config.host));
173170
logv(c, format!("adb_path: {}", config.adb_path));
174171
logv(c, format!("adb_test_dir: {}", config.adb_test_dir));
175172
logv(c, format!("adb_device_status: {}", config.adb_device_status));

‎trunk/src/compiletest/errors.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::io::{BufferedReader, File};
11+
use std::io::buffered::BufferedReader;
12+
use std::io::File;
1213

1314
pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
1415

‎trunk/src/compiletest/header.rs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ pub struct TestProps {
2828
debugger_cmds: ~[~str],
2929
// Lines to check if they appear in the expected debugger output
3030
check_lines: ~[~str],
31-
// Flag to force a crate to be built with the host architecture
32-
force_host: bool,
3331
}
3432

3533
// Load any test directives embedded in the file
@@ -41,7 +39,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
4139
let mut pp_exact = None;
4240
let mut debugger_cmds = ~[];
4341
let mut check_lines = ~[];
44-
let mut force_host = false;
4542
iter_header(testfile, |ln| {
4643
match parse_error_pattern(ln) {
4744
Some(ep) => error_patterns.push(ep),
@@ -56,10 +53,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
5653
pp_exact = parse_pp_exact(ln, testfile);
5754
}
5855

59-
if !force_host {
60-
force_host = parse_force_host(ln);
61-
}
62-
6356
match parse_aux_build(ln) {
6457
Some(ab) => { aux_builds.push(ab); }
6558
None => {}
@@ -89,8 +82,7 @@ pub fn load_props(testfile: &Path) -> TestProps {
8982
aux_builds: aux_builds,
9083
exec_env: exec_env,
9184
debugger_cmds: debugger_cmds,
92-
check_lines: check_lines,
93-
force_host: force_host,
85+
check_lines: check_lines
9486
};
9587
}
9688

@@ -115,7 +107,8 @@ pub fn is_test_ignored(config: &config, testfile: &Path) -> bool {
115107
}
116108

117109
fn iter_header(testfile: &Path, it: |&str| -> bool) -> bool {
118-
use std::io::{BufferedReader, File};
110+
use std::io::buffered::BufferedReader;
111+
use std::io::File;
119112

120113
let mut rdr = BufferedReader::new(File::open(testfile).unwrap());
121114
for ln in rdr.lines() {
@@ -149,10 +142,6 @@ fn parse_check_line(line: &str) -> Option<~str> {
149142
parse_name_value_directive(line, ~"check")
150143
}
151144

152-
fn parse_force_host(line: &str) -> bool {
153-
parse_name_directive(line, "force-host")
154-
}
155-
156145
fn parse_exec_env(line: &str) -> Option<(~str, ~str)> {
157146
parse_name_value_directive(line, ~"exec-env").map(|nv| {
158147
// nv is either FOO or FOO=BAR

‎trunk/src/compiletest/runtest.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -691,9 +691,8 @@ fn compose_and_run_compiler(
691691

692692
for rel_ab in props.aux_builds.iter() {
693693
let abs_ab = config.aux_base.join(rel_ab.as_slice());
694-
let aux_props = load_props(&abs_ab);
695694
let aux_args =
696-
make_compile_args(config, &aux_props, ~[~"--lib"] + extra_link_args,
695+
make_compile_args(config, props, ~[~"--lib"] + extra_link_args,
697696
|a,b| make_lib_name(a, b, testfile), &abs_ab);
698697
let auxres = compose_and_run(config, &abs_ab, aux_args, ~[],
699698
config.compile_lib_path, None);
@@ -739,16 +738,10 @@ fn make_compile_args(config: &config,
739738
testfile: &Path)
740739
-> ProcArgs {
741740
let xform_file = xform(config, testfile);
742-
let target = if props.force_host {
743-
config.host.as_slice()
744-
} else {
745-
config.target.as_slice()
746-
};
747741
// FIXME (#9639): This needs to handle non-utf8 paths
748742
let mut args = ~[testfile.as_str().unwrap().to_owned(),
749743
~"-o", xform_file.as_str().unwrap().to_owned(),
750-
~"-L", config.build_base.as_str().unwrap().to_owned(),
751-
~"--target=" + target]
744+
~"-L", config.build_base.as_str().unwrap().to_owned()]
752745
+ extras;
753746
args.push_all_move(split_maybe_args(&config.rustcflags));
754747
args.push_all_move(split_maybe_args(&props.compile_flags));

0 commit comments

Comments
 (0)