@@ -152,8 +152,8 @@ fn collect_tests_from_dir(config: &Config,
152152 -> io:: Result < ( ) > {
153153 // Ignore directories that contain a file
154154 // `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? ;
157157 let name = file. file_name ( ) ;
158158 if name == * "compiletest-ignore-dir" {
159159 return Ok ( ( ) ) ;
@@ -180,9 +180,9 @@ fn collect_tests_from_dir(config: &Config,
180180
181181 // Add each `.rs` file as a test, and recurse further on any
182182 // subdirectories we find, except for `aux` directories.
183- let dirs = try! ( fs:: read_dir ( dir) ) ;
183+ let dirs = fs:: read_dir ( dir) ? ;
184184 for file in dirs {
185- let file = try! ( file) ;
185+ let file = file? ;
186186 let file_path = file. path ( ) ;
187187 let file_name = file. file_name ( ) ;
188188 if is_test ( & file_name) {
@@ -213,11 +213,11 @@ fn collect_tests_from_dir(config: &Config,
213213 fs:: create_dir_all ( & build_dir) . unwrap ( ) ;
214214 } else {
215215 debug ! ( "found directory: {:?}" , file_path. display( ) ) ;
216- try! ( collect_tests_from_dir ( config,
216+ collect_tests_from_dir ( config,
217217 base,
218218 & file_path,
219219 & relative_file_path,
220- tests) ) ;
220+ tests) ? ;
221221 }
222222 } else {
223223 debug ! ( "found other file/directory: {:?}" , file_path. display( ) ) ;
0 commit comments