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