@@ -72,7 +72,7 @@ doctest!("../README.md");
72
72
use std:: cmp;
73
73
use std:: cmp:: Ordering ;
74
74
use std:: error:: Error ;
75
- use std:: ffi:: OsString ;
75
+ use std:: ffi:: OsStr ;
76
76
use std:: fmt;
77
77
use std:: fs;
78
78
use std:: fs:: DirEntry ;
@@ -330,11 +330,11 @@ impl fmt::Display for GlobError {
330
330
struct PathWrapper {
331
331
path : PathBuf ,
332
332
is_directory : bool ,
333
- file_name : Option < OsString > ,
333
+ file_name : Option < Box < OsStr > > ,
334
334
}
335
335
336
336
impl PathWrapper {
337
- fn from_dir_entry ( path : PathBuf , file_name : Option < OsString > , e : DirEntry ) -> Self {
337
+ fn from_dir_entry ( path : PathBuf , file_name : Option < Box < OsStr > > , e : DirEntry ) -> Self {
338
338
let is_directory = e
339
339
. file_type ( )
340
340
. ok ( )
@@ -357,7 +357,7 @@ impl PathWrapper {
357
357
}
358
358
fn from_path ( path : PathBuf ) -> Self {
359
359
let is_directory = fs:: metadata ( & path) . map ( |m| m. is_dir ( ) ) . unwrap_or ( false ) ;
360
- let file_name = path. file_name ( ) . map ( ToOwned :: to_owned ) ;
360
+ let file_name = path. file_name ( ) . map ( Box :: from ) ;
361
361
Self {
362
362
path,
363
363
is_directory,
@@ -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) , Some ( file_name . to_owned ( ) ) )
947
+ ( PathBuf :: from ( file_name) , Some ( Box :: from ( file_name ) ) )
948
948
} else {
949
949
let path = e. path ( ) ;
950
- let file_name = path. file_name ( ) . map ( ToOwned :: to_owned ) ;
950
+ let file_name = path. file_name ( ) . map ( Box :: from ) ;
951
951
( path, file_name)
952
952
} ;
953
953
PathWrapper :: from_dir_entry ( path, file_name, e)
0 commit comments