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 @@ -335,7 +335,7 @@ struct PathWrapper {
335
335
}
336
336
337
337
impl PathWrapper {
338
- fn from_dir_entry ( path : PathBuf , file_name : OsString , e : DirEntry ) -> Self {
338
+ fn from_dir_entry ( path : PathBuf , file_name : Option < OsString > , e : DirEntry ) -> Self {
339
339
let is_directory = e
340
340
. file_type ( )
341
341
. ok ( )
@@ -353,7 +353,7 @@ impl PathWrapper {
353
353
Self {
354
354
path,
355
355
is_directory,
356
- file_name : Some ( file_name ) ,
356
+ file_name,
357
357
}
358
358
}
359
359
fn from_path ( path : PathBuf ) -> Self {
@@ -941,10 +941,10 @@ fn fill_todo(
941
941
let ( path, file_name) = if curdir {
942
942
let path = e. path ( ) ;
943
943
let file_name = path. file_name ( ) . unwrap ( ) ;
944
- ( PathBuf :: from ( file_name) , file_name. to_owned ( ) )
944
+ ( PathBuf :: from ( file_name) , Some ( file_name. to_owned ( ) ) )
945
945
} else {
946
946
let path = e. path ( ) ;
947
- let file_name = path. file_name ( ) . unwrap ( ) . to_owned ( ) ;
947
+ let file_name = path. file_name ( ) . map ( ToOwned :: to_owned) ;
948
948
( path, file_name)
949
949
} ;
950
950
PathWrapper :: from_dir_entry ( path, file_name, e)
You can’t perform that action at this time.
0 commit comments