Skip to content

Commit b3860e0

Browse files
tshepangtshepang
committed
---
yaml --- r: 273766 b: refs/heads/beta c: 05d0aa6 h: refs/heads/master
1 parent c9b7401 commit b3860e0

File tree

650 files changed

+9532
-18229
lines changed

Some content is hidden

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

650 files changed

+9532
-18229
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 45d633db2650bbef5b6a69bb2aba4eac8fc5d878
26+
refs/heads/beta: 05d0aa6dcc0a9f37eab1cd595d6f269fde750c20
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

‎branches/beta/COMPILER_TESTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn test_foo() {
7777
}
7878
```
7979

80-
Note that not all headers have meaning when customized too a revision.
80+
Note that not all headers have meaning when customized to a revision.
8181
For example, the `ignore-test` header (and all "ignore" headers)
8282
currently only apply to the test as a whole, not to particular
8383
revisions. The only headers that are intended to really work when

‎branches/beta/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ Some common make targets are:
132132
- `make check-stage1-std NO_REBUILD=1` - test the standard library without
133133
rebuilding the entire compiler
134134
- `make check TESTNAME=<substring-of-test-name>` - Run a matching set of tests.
135-
- `TESTNAME` should be a substring of the tests to match against e.g. it could
136-
be the fully qualified test name, or just a part of it.
135+
- `TESTNAME` should be a substring of the tests to match against e.g. it could
136+
be the fully qualified test name, or just a part of it.
137137
`TESTNAME=collections::hash::map::test_map::test_capacity_not_less_than_len`
138138
or `TESTNAME=test_capacity_not_less_than_len`.
139139
- `make check-stage1-rpass TESTNAME=<substring-of-test-name>` - Run a single

‎branches/beta/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ build.
7777
7878
Download [MinGW from
7979
here](http://mingw-w64.org/doku.php/download/mingw-builds), and choose the
80-
`version=4.9.x,threads=win32,exceptions=dwarf/seh` flavor when installing. Also, make sure to install to a path without spaces in it. After installing,
80+
`threads=win32,exceptions=dwarf/seh` flavor when installing. Also, make sure to install to a path without spaces in it. After installing,
8181
add its `bin` directory to your `PATH`. This is due to [#28260](https://github.com/rust-lang/rust/issues/28260), in the future,
8282
installing from pacman should be just fine.
8383

‎branches/beta/RELEASES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ Compatibility Notes
116116
that were not intended. In this release, [defaulted type parameters
117117
appearing outside of type definitions will generate a
118118
warning][1.7d], which will become an error in future releases.
119-
* [Parsing "." as a float results in an error instead of 0][1.7p].
120-
That is, `".".parse::<f32>()` returns `Err`, not `Ok(0.0)`.
119+
* [Parsing "." as a float results in an error instead of
120+
0][1.7p]. That is, `".".parse::<f32>()` returns `Err`, not `Ok(0)`.
121121
* [Borrows of closure parameters may not outlive the closure][1.7bc].
122122

123123
[1.7a]: https://github.com/rust-lang/rust/pull/30928

‎branches/beta/configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -969,11 +969,11 @@ then
969969
LLVM_VERSION=$($LLVM_CONFIG --version)
970970

971971
case $LLVM_VERSION in
972-
(3.[6-8]*)
972+
(3.[5-8]*)
973973
msg "found ok version of LLVM: $LLVM_VERSION"
974974
;;
975975
(*)
976-
err "bad LLVM version: $LLVM_VERSION, need >=3.6"
976+
err "bad LLVM version: $LLVM_VERSION, need >=3.5"
977977
;;
978978
esac
979979
fi
@@ -1034,7 +1034,7 @@ then
10341034
if [ -n "$CFG_OSX_CLANG_VERSION" ]
10351035
then
10361036
case $CFG_OSX_CLANG_VERSION in
1037-
(7.0* | 7.1* | 7.2* | 7.3*)
1037+
(7.0* | 7.1* | 7.2*)
10381038
step_msg "found ok version of APPLE CLANG: $CFG_OSX_CLANG_VERSION"
10391039
;;
10401040
(*)
@@ -1252,7 +1252,7 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
12521252
bits=x86_64
12531253
msvc_part=amd64
12541254
;;
1255-
i*86-*)
1255+
i686-*)
12561256
bits=i386
12571257
msvc_part=
12581258
;;

‎branches/beta/mk/cfg/i586-unknown-linux-gnu.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ CFG_LIB_NAME_i586-unknown-linux-gnu=lib$(1).so
77
CFG_STATIC_LIB_NAME_i586-unknown-linux-gnu=lib$(1).a
88
CFG_LIB_GLOB_i586-unknown-linux-gnu=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_i586-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
10-
CFG_JEMALLOC_CFLAGS_i586-unknown-linux-gnu := -m32 $(CFLAGS) -march=pentium
11-
CFG_GCCISH_CFLAGS_i586-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) -march=pentium
12-
CFG_GCCISH_CXXFLAGS_i586-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) -march=pentium
10+
CFG_JEMALLOC_CFLAGS_i586-unknown-linux-gnu := -m32 $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_i586-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_i586-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_i586-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
1414
CFG_GCCISH_DEF_FLAG_i586-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
1515
CFG_LLC_FLAGS_i586-unknown-linux-gnu :=

‎branches/beta/mk/crates.mk

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ TARGET_CRATES := libc std term \
5353
getopts collections test rand \
5454
core alloc \
5555
rustc_unicode rustc_bitflags \
56-
alloc_system alloc_jemalloc
56+
alloc_system alloc_jemalloc rustc_const_eval
5757
RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_driver \
5858
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
5959
rustc_data_structures rustc_front rustc_platform_intrinsics \
60-
rustc_plugin rustc_metadata rustc_passes rustc_save_analysis \
61-
rustc_const_eval
60+
rustc_plugin rustc_metadata rustc_passes
6261
HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros \
6362
flate arena graphviz rbml log serialize
6463
TOOLS := compiletest rustdoc rustc rustbook error_index_generator
@@ -95,36 +94,35 @@ DEPS_syntax_ext := syntax fmt_macros
9594
DEPS_rustc_const_eval := std syntax
9695

9796
DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml rustc_front\
98-
log graphviz rustc_back rustc_data_structures\
97+
log graphviz rustc_llvm rustc_back rustc_data_structures\
9998
rustc_const_eval
100-
DEPS_rustc_back := std syntax rustc_front flate log libc
101-
DEPS_rustc_borrowck := rustc rustc_front rustc_mir log graphviz syntax
99+
DEPS_rustc_back := std syntax rustc_llvm rustc_front flate log libc
100+
DEPS_rustc_borrowck := rustc rustc_front log graphviz syntax
102101
DEPS_rustc_data_structures := std log serialize
103102
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
104103
rustc_typeck rustc_mir rustc_resolve log syntax serialize rustc_llvm \
105104
rustc_trans rustc_privacy rustc_lint rustc_front rustc_plugin \
106-
rustc_metadata syntax_ext rustc_passes rustc_save_analysis
105+
rustc_metadata syntax_ext rustc_passes
107106
DEPS_rustc_front := std syntax log serialize
108107
DEPS_rustc_lint := rustc log syntax
109108
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
110109
DEPS_rustc_metadata := rustc rustc_front syntax rbml rustc_const_eval
111110
DEPS_rustc_passes := syntax rustc core rustc_front
112111
DEPS_rustc_mir := rustc rustc_front syntax rustc_const_eval
113112
DEPS_rustc_resolve := arena rustc rustc_front log syntax
114-
DEPS_rustc_platform_intrinsics := std
113+
DEPS_rustc_platform_intrinsics := rustc rustc_llvm
115114
DEPS_rustc_plugin := rustc rustc_metadata syntax rustc_mir
116115
DEPS_rustc_privacy := rustc rustc_front log syntax
117116
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir \
118117
log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics \
119118
rustc_const_eval
120-
DEPS_rustc_save_analysis := rustc log syntax rustc_front
121119
DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics rustc_const_eval
122120

123121
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
124122
test rustc_lint rustc_front
125123

126124

127-
TOOL_DEPS_compiletest := test getopts log
125+
TOOL_DEPS_compiletest := test getopts
128126
TOOL_DEPS_rustdoc := rustdoc
129127
TOOL_DEPS_rustc := rustc_driver
130128
TOOL_DEPS_rustbook := std rustdoc

‎branches/beta/mk/main.mk

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ endif
493493
LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3) := \
494494
$$(CURDIR)/$$(HLIB$(1)_H_$(3)):$$(CFG_LLVM_INST_DIR_$(3))/lib
495495
LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3) := \
496-
$$(CURDIR)/$$(TLIB$(1)_T_$(2)_H_$(3))
496+
$$(CURDIR)/$$(TLIB1_T_$(2)_H_$(CFG_BUILD))
497497

498498
HOST_RPATH_VAR$(1)_T_$(2)_H_$(3) := \
499499
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))=$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3)):$$$$$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))
@@ -506,14 +506,18 @@ RPATH_VAR$(1)_T_$(2)_H_$(3) := $$(HOST_RPATH_VAR$(1)_T_$(2)_H_$(3))
506506
# if you're building a cross config, the host->* parts are
507507
# effectively stage1, since it uses the just-built stage0.
508508
#
509-
# Also be sure to use the right rpath because we're loading libraries from the
510-
# CFG_BUILD's stage1 directory for our target, so switch this one instance of
511-
# `RPATH_VAR` to get the bootstrap working.
509+
# This logic is similar to how the LD_LIBRARY_PATH variable must
510+
# change be slightly different when doing cross compilations.
511+
# The build doesn't copy over all target libraries into
512+
# a new directory, so we need to point the library path at
513+
# the build directory where all the target libraries came
514+
# from (the stage0 build host). Otherwise the relative rpaths
515+
# inside of the rustc binary won't get resolved correctly.
512516
ifeq ($(1),0)
513517
ifneq ($(strip $(CFG_BUILD)),$(strip $(3)))
514518
CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
515519

516-
RPATH_VAR$(1)_T_$(2)_H_$(3) := $$(TARGET_RPATH_VAR1_T_$(2)_H_$$(CFG_BUILD))
520+
RPATH_VAR$(1)_T_$(2)_H_$(3) := $$(TARGET_RPATH_VAR$(1)_T_$(2)_H_$(3))
517521
endif
518522
endif
519523

‎branches/beta/mk/rt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ COMPRT_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(COMPRT_NAME_$(1))
236236
COMPRT_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/compiler-rt
237237

238238
ifeq ($$(findstring msvc,$(1)),msvc)
239-
$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS) $$(LLVM_CONFIG_$$(CFG_BUILD))
239+
$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
240240
@$$(call E, cmake: compiler-rt)
241241
$$(Q)cd "$$(COMPRT_BUILD_DIR_$(1))"; $$(CFG_CMAKE) "$(S)src/compiler-rt" \
242242
-DCMAKE_BUILD_TYPE=$$(LLVM_BUILD_CONFIG_MODE) \
243-
-DLLVM_CONFIG_PATH=$$(LLVM_CONFIG_$$(CFG_BUILD)) \
243+
-DLLVM_CONFIG_PATH=$$(LLVM_CONFIG_$(1)) \
244244
-G"$$(CFG_CMAKE_GENERATOR)"
245245
$$(Q)$$(CFG_CMAKE) --build "$$(COMPRT_BUILD_DIR_$(1))" \
246246
--target lib/builtins/builtins \

‎branches/beta/mk/target.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
8989
$$(RUSTFLAGS$(1)_$(4)_T_$(2)) \
9090
--out-dir $$(@D) \
9191
-C extra-filename=-$$(CFG_FILENAME_EXTRA) \
92-
-C metadata=$$(CFG_FILENAME_EXTRA) \
9392
$$<
9493
@touch -r $$@.start_time $$@ && rm $$@.start_time
9594
$$(call LIST_ALL_OLD_GLOB_MATCHES, \

‎branches/beta/mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
383383
@$$(call E, rustc: $$@)
384384
$(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(2)) \
385385
$$(subst @,,$$(STAGE$(1)_T_$(2)_H_$(3))) -o $$@ $$< --test \
386-
-Cmetadata="test-crate" -L "$$(RT_OUTPUT_DIR_$(2))" \
386+
-L "$$(RT_OUTPUT_DIR_$(2))" \
387387
$$(LLVM_LIBDIR_RUSTFLAGS_$(2)) \
388388
$$(RUSTFLAGS_$(4))
389389

‎branches/beta/src/bootstrap/build/check.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,3 @@ pub fn linkcheck(build: &Build, stage: u32, host: &str) {
1616
build.run(build.tool_cmd(&compiler, "linkchecker")
1717
.arg(build.out.join(host).join("doc")));
1818
}
19-
20-
pub fn cargotest(build: &Build, stage: u32, host: &str) {
21-
let ref compiler = Compiler::new(stage, host);
22-
build.run(build.tool_cmd(compiler, "cargotest")
23-
.env("RUSTC", build.compiler_path(compiler))
24-
.env("RUSTDOC", build.rustdoc(compiler))
25-
.arg(&build.cargo));
26-
}

‎branches/beta/src/bootstrap/build/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ impl Build {
183183
compile::tool(self, stage, target.target,
184184
"error_index_generator");
185185
}
186-
ToolCargoTest { stage } => {
187-
compile::tool(self, stage, target.target, "cargotest");
188-
}
189186
DocBook { stage } => {
190187
doc::rustbook(self, stage, target.target, "book", &doc_out);
191188
}
@@ -213,9 +210,6 @@ impl Build {
213210
CheckLinkcheck { stage } => {
214211
check::linkcheck(self, stage, target.target);
215212
}
216-
CheckCargoTest { stage } => {
217-
check::cargotest(self, stage, target.target);
218-
}
219213

220214
DistDocs { stage } => dist::docs(self, stage, target.target),
221215
DistMingw { _dummy } => dist::mingw(self, target.target),

‎branches/beta/src/bootstrap/build/native.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ pub fn compiler_rt(build: &Build, target: &str) {
114114
let arch = target.split('-').next().unwrap();
115115
let mode = if build.config.rust_optimize {"Release"} else {"Debug"};
116116
let (dir, build_target, libname) = if target.contains("linux") ||
117-
target.contains("freebsd") ||
118-
target.contains("netbsd") {
117+
target.contains("freebsd") {
119118
let os = if target.contains("android") {"-android"} else {""};
120119
let arch = if arch.starts_with("arm") && target.contains("eabihf") {
121120
"armhf"

‎branches/beta/src/bootstrap/build/step.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ macro_rules! targets {
4747
(tool_linkchecker, ToolLinkchecker { stage: u32 }),
4848
(tool_rustbook, ToolRustbook { stage: u32 }),
4949
(tool_error_index, ToolErrorIndex { stage: u32 }),
50-
(tool_cargotest, ToolCargoTest { stage: u32 }),
5150

5251
// Steps for long-running native builds. Ideally these wouldn't
5352
// actually exist and would be part of build scripts, but for now
@@ -74,7 +73,6 @@ macro_rules! targets {
7473
// target to depend on a bunch of others.
7574
(check, Check { stage: u32, compiler: Compiler<'a> }),
7675
(check_linkcheck, CheckLinkcheck { stage: u32 }),
77-
(check_cargotest, CheckCargoTest { stage: u32 }),
7876

7977
// Distribution targets, creating tarballs
8078
(dist, Dist { stage: u32 }),
@@ -294,9 +292,6 @@ impl<'a> Step<'a> {
294292
Source::CheckLinkcheck { stage } => {
295293
vec![self.tool_linkchecker(stage), self.doc(stage)]
296294
}
297-
Source::CheckCargoTest { stage } => {
298-
vec![self.tool_cargotest(stage)]
299-
}
300295

301296
Source::ToolLinkchecker { stage } => {
302297
vec![self.libstd(self.compiler(stage))]
@@ -305,9 +300,6 @@ impl<'a> Step<'a> {
305300
Source::ToolRustbook { stage } => {
306301
vec![self.librustc(self.compiler(stage))]
307302
}
308-
Source::ToolCargoTest { stage } => {
309-
vec![self.libstd(self.compiler(stage))]
310-
}
311303

312304
Source::DistDocs { stage } => vec![self.doc(stage)],
313305
Source::DistMingw { _dummy: _ } => Vec::new(),

‎branches/beta/src/bootstrap/mk/Makefile.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ standalone-docs:
3838
$(Q)$(BOOTSTRAP) --step doc-standalone
3939
check:
4040
$(Q)$(BOOTSTRAP) --step check
41-
check-cargotest:
42-
$(Q)$(BOOTSTRAP) --step check-cargotest
4341
dist:
4442
$(Q)$(BOOTSTRAP) --step dist
4543

‎branches/beta/src/compiletest/common.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ impl fmt::Display for Mode {
6969
#[derive(Clone)]
7070
pub struct Config {
7171
// The library paths required for running the compiler
72-
pub compile_lib_path: PathBuf,
72+
pub compile_lib_path: String,
7373

7474
// The library paths required for running compiled programs
75-
pub run_lib_path: PathBuf,
75+
pub run_lib_path: String,
7676

7777
// The rustc executable
7878
pub rustc_path: PathBuf,

‎branches/beta/src/compiletest/compiletest.rs

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(rustc_private)]
1616
#![feature(str_char)]
1717
#![feature(test)]
18-
#![feature(question_mark)]
1918

2019
#![deny(warnings)]
2120

@@ -118,17 +117,9 @@ pub fn parse_config(args: Vec<String> ) -> Config {
118117
}
119118
}
120119

121-
fn make_absolute(path: PathBuf) -> PathBuf {
122-
if path.is_relative() {
123-
env::current_dir().unwrap().join(path)
124-
} else {
125-
path
126-
}
127-
}
128-
129120
Config {
130-
compile_lib_path: make_absolute(opt_path(matches, "compile-lib-path")),
131-
run_lib_path: make_absolute(opt_path(matches, "run-lib-path")),
121+
compile_lib_path: matches.opt_str("compile-lib-path").unwrap(),
122+
run_lib_path: matches.opt_str("run-lib-path").unwrap(),
132123
rustc_path: opt_path(matches, "rustc-path"),
133124
rustdoc_path: opt_path(matches, "rustdoc-path"),
134125
python: matches.opt_str("python").unwrap(),
@@ -289,16 +280,16 @@ fn collect_tests_from_dir(config: &Config,
289280
-> io::Result<()> {
290281
// Ignore directories that contain a file
291282
// `compiletest-ignore-dir`.
292-
for file in fs::read_dir(dir)? {
293-
let file = file?;
283+
for file in try!(fs::read_dir(dir)) {
284+
let file = try!(file);
294285
if file.file_name() == *"compiletest-ignore-dir" {
295286
return Ok(());
296287
}
297288
}
298289

299-
let dirs = fs::read_dir(dir)?;
290+
let dirs = try!(fs::read_dir(dir));
300291
for file in dirs {
301-
let file = file?;
292+
let file = try!(file);
302293
let file_path = file.path();
303294
debug!("inspecting file {:?}", file_path.display());
304295
if is_test(config, &file_path) {
@@ -319,11 +310,11 @@ fn collect_tests_from_dir(config: &Config,
319310
tests.push(make_test(config, &paths))
320311
} else if file_path.is_dir() {
321312
let relative_file_path = relative_dir_path.join(file.file_name());
322-
collect_tests_from_dir(config,
323-
base,
324-
&file_path,
325-
&relative_file_path,
326-
tests)?;
313+
try!(collect_tests_from_dir(config,
314+
base,
315+
&file_path,
316+
&relative_file_path,
317+
tests));
327318
}
328319
}
329320
Ok(())

0 commit comments

Comments
 (0)