File tree 1 file changed +4
-4
lines changed
1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -334,7 +334,7 @@ struct PathWrapper {
334
334
}
335
335
336
336
impl PathWrapper {
337
- fn from_dir_entry ( path : PathBuf , file_name : OsString , e : DirEntry ) -> Self {
337
+ fn from_dir_entry ( path : PathBuf , file_name : Option < OsString > , e : DirEntry ) -> Self {
338
338
let is_directory = e
339
339
. file_type ( )
340
340
. ok ( )
@@ -352,7 +352,7 @@ impl PathWrapper {
352
352
Self {
353
353
path,
354
354
is_directory,
355
- file_name : Some ( file_name ) ,
355
+ file_name,
356
356
}
357
357
}
358
358
fn from_path ( path : PathBuf ) -> Self {
@@ -944,10 +944,10 @@ fn fill_todo(
944
944
let ( path, file_name) = if curdir {
945
945
let path = e. path ( ) ;
946
946
let file_name = path. file_name ( ) . unwrap ( ) ;
947
- ( PathBuf :: from ( file_name) , file_name. to_owned ( ) )
947
+ ( PathBuf :: from ( file_name) , Some ( file_name. to_owned ( ) ) )
948
948
} else {
949
949
let path = e. path ( ) ;
950
- let file_name = path. file_name ( ) . unwrap ( ) . to_owned ( ) ;
950
+ let file_name = path. file_name ( ) . map ( ToOwned :: to_owned) ;
951
951
( path, file_name)
952
952
} ;
953
953
PathWrapper :: from_dir_entry ( path, file_name, e)
You can’t perform that action at this time.
0 commit comments