@@ -251,11 +251,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
251251 if self . parse_sess . is_file_parsed ( & path) {
252252 return Ok ( None ) ;
253253 }
254- return match Parser :: parse_file_as_module (
255- self . parse_sess ,
256- & path,
257- sub_mod. inner ,
258- ) {
254+ return match Parser :: parse_file_as_module ( self . parse_sess , & path, sub_mod. inner ) {
259255 Some ( m) => Ok ( Some ( SubModKind :: External (
260256 path,
261257 DirectoryOwnership :: Owned { relative : None } ,
@@ -293,16 +289,10 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
293289 return Ok ( Some ( SubModKind :: MultiExternal ( mods_outside_ast) ) ) ;
294290 }
295291 }
296- match Parser :: parse_file_as_module (
297- self . parse_sess ,
298- & path,
299- sub_mod. inner ,
300- ) {
301- Some ( m) if outside_mods_empty => Ok ( Some ( SubModKind :: External (
302- path,
303- ownership,
304- Cow :: Owned ( m) ,
305- ) ) ) ,
292+ match Parser :: parse_file_as_module ( self . parse_sess , & path, sub_mod. inner ) {
293+ Some ( m) if outside_mods_empty => {
294+ Ok ( Some ( SubModKind :: External ( path, ownership, Cow :: Owned ( m) ) ) )
295+ }
306296 Some ( m) => {
307297 mods_outside_ast. push ( ( path. clone ( ) , ownership, Cow :: Owned ( m) ) ) ;
308298 if should_insert {
@@ -319,7 +309,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
319309 mods_outside_ast. push ( ( path, ownership, sub_mod. clone ( ) ) ) ;
320310 }
321311 Ok ( Some ( SubModKind :: MultiExternal ( mods_outside_ast) ) )
322- } ,
312+ }
323313 }
324314 }
325315 Err ( mut e) if !mods_outside_ast. is_empty ( ) => {
@@ -385,11 +375,8 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
385375 ) ) ;
386376 continue ;
387377 }
388- let m = match Parser :: parse_file_as_module (
389- self . parse_sess ,
390- & actual_path,
391- sub_mod. inner ,
392- ) {
378+ let m = match Parser :: parse_file_as_module ( self . parse_sess , & actual_path, sub_mod. inner )
379+ {
393380 Some ( m) => m,
394381 None => continue ,
395382 } ;
0 commit comments