@@ -692,7 +692,7 @@ mod os {
692
692
let cmd_to_exec = config. executable . as_ref ( ) . unwrap_or ( & argv[ 0 ] ) ;
693
693
let just_exec = posix:: stage_exec (
694
694
cmd_to_exec,
695
- & argv[ .. ] ,
695
+ & argv,
696
696
child_env. as_deref ( ) ,
697
697
) ?;
698
698
unsafe {
@@ -710,7 +710,7 @@ mod os {
710
710
let result = Popen :: do_exec (
711
711
just_exec,
712
712
child_ends,
713
- config. cwd . as_ref ( ) . map ( |x| & x [ .. ] ) ,
713
+ config. cwd . as_deref ( ) ,
714
714
config. setuid ,
715
715
config. setgid ,
716
716
) ;
@@ -987,7 +987,7 @@ mod os {
987
987
executable. as_ref ( ) . map ( OsString :: as_ref) ,
988
988
& cmdline,
989
989
& env_block,
990
- & config. cwd . as_ref ( ) . map ( |os| & os [ .. ] ) ,
990
+ & config. cwd . as_deref ( ) ,
991
991
true ,
992
992
0 ,
993
993
raw ( & child_stdin) ,
@@ -1089,7 +1089,7 @@ mod os {
1089
1089
block
1090
1090
}
1091
1091
1092
- trait PopenOsImpl : super :: PopenOs {
1092
+ trait PopenOsImpl {
1093
1093
fn wait_handle ( & mut self , timeout : Option < Duration > ) -> io:: Result < Option < ExitStatus > > ;
1094
1094
}
1095
1095
@@ -1264,7 +1264,7 @@ fn get_standard_stream(which: StandardStream) -> io::Result<Rc<File>> {
1264
1264
#[ derive( Debug ) ]
1265
1265
#[ non_exhaustive]
1266
1266
pub enum PopenError {
1267
- /// The underlying error is io::Error .
1267
+ /// An IO system call failed while executing the requested operation .
1268
1268
IoError ( io:: Error ) ,
1269
1269
/// A logical error was made, e.g. invalid arguments detected at run-time.
1270
1270
LogicError ( & ' static str ) ,
@@ -1285,7 +1285,7 @@ impl From<communicate::CommunicateError> for PopenError {
1285
1285
impl Error for PopenError {
1286
1286
fn source ( & self ) -> Option < & ( dyn Error + ' static ) > {
1287
1287
match * self {
1288
- PopenError :: IoError ( ref err) => Some ( err as & dyn Error ) ,
1288
+ PopenError :: IoError ( ref err) => Some ( err) ,
1289
1289
PopenError :: LogicError ( _msg) => None ,
1290
1290
}
1291
1291
}
0 commit comments