@@ -151,8 +151,8 @@ fn collect_tests_from_dir(config: &Config,
151
151
-> io:: Result < ( ) > {
152
152
// Ignore directories that contain a file
153
153
// `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? ;
156
156
let name = file. file_name ( ) ;
157
157
if name == * "compiletest-ignore-dir" {
158
158
return Ok ( ( ) ) ;
@@ -179,9 +179,9 @@ fn collect_tests_from_dir(config: &Config,
179
179
180
180
// Add each `.rs` file as a test, and recurse further on any
181
181
// subdirectories we find, except for `aux` directories.
182
- let dirs = try! ( fs:: read_dir ( dir) ) ;
182
+ let dirs = fs:: read_dir ( dir) ? ;
183
183
for file in dirs {
184
- let file = try! ( file) ;
184
+ let file = file? ;
185
185
let file_path = file. path ( ) ;
186
186
let file_name = file. file_name ( ) ;
187
187
if is_test ( & file_name) {
@@ -212,11 +212,11 @@ fn collect_tests_from_dir(config: &Config,
212
212
fs:: create_dir_all ( & build_dir) . unwrap ( ) ;
213
213
} else {
214
214
debug ! ( "found directory: {:?}" , file_path. display( ) ) ;
215
- try! ( collect_tests_from_dir ( config,
215
+ collect_tests_from_dir ( config,
216
216
base,
217
217
& file_path,
218
218
& relative_file_path,
219
- tests) ) ;
219
+ tests) ? ;
220
220
}
221
221
} else {
222
222
debug ! ( "found other file/directory: {:?}" , file_path. display( ) ) ;
0 commit comments