Skip to content

Commit 1801ce4

Browse files
committed
Replace deprecated try! macro with ? operator
1 parent 1798661 commit 1801ce4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/lib.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ fn collect_tests_from_dir(config: &Config,
151151
-> io::Result<()> {
152152
// Ignore directories that contain a file
153153
// `compiletest-ignore-dir`.
154-
for file in try!(fs::read_dir(dir)) {
155-
let file = try!(file);
154+
for file in fs::read_dir(dir)? {
155+
let file = file?;
156156
let name = file.file_name();
157157
if name == *"compiletest-ignore-dir" {
158158
return Ok(());
@@ -179,9 +179,9 @@ fn collect_tests_from_dir(config: &Config,
179179

180180
// Add each `.rs` file as a test, and recurse further on any
181181
// subdirectories we find, except for `aux` directories.
182-
let dirs = try!(fs::read_dir(dir));
182+
let dirs = fs::read_dir(dir)?;
183183
for file in dirs {
184-
let file = try!(file);
184+
let file = file?;
185185
let file_path = file.path();
186186
let file_name = file.file_name();
187187
if is_test(&file_name) {
@@ -212,11 +212,11 @@ fn collect_tests_from_dir(config: &Config,
212212
fs::create_dir_all(&build_dir).unwrap();
213213
} else {
214214
debug!("found directory: {:?}", file_path.display());
215-
try!(collect_tests_from_dir(config,
215+
collect_tests_from_dir(config,
216216
base,
217217
&file_path,
218218
&relative_file_path,
219-
tests));
219+
tests)?;
220220
}
221221
} else {
222222
debug!("found other file/directory: {:?}", file_path.display());

0 commit comments

Comments
 (0)