File tree Expand file tree Collapse file tree 3 files changed +4
-5
lines changed
Expand file tree Collapse file tree 3 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -406,8 +406,7 @@ asroot chown "$USER:$USER" {0}
406406 }
407407
408408 // remove pre-init flag to start initalization
409- ctx. engine
410- . exec ( id, & vec ! [ "rm" , crate :: FLAG_FILE_PRE_INIT ] ) ?;
409+ ctx. engine . exec ( id, & [ "rm" , crate :: FLAG_FILE_PRE_INIT ] ) ?;
411410
412411 log:: trace!( "Waiting for container initialization" ) ;
413412
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ pub fn find_terminfo() -> Vec<String> {
8080 }
8181
8282 // use TERMINFO_DIRS if defined
83- if let Some ( env_dirs) = std:: env:: var ( "TERMINFO_DIRS" ) . ok ( ) {
83+ if let Ok ( env_dirs) = std:: env:: var ( "TERMINFO_DIRS" ) {
8484 log:: debug!( "Looking for terminfo directories from environment variable" ) ;
8585
8686 // filter existing directories
Original file line number Diff line number Diff line change @@ -30,14 +30,14 @@ impl TryInto<Config> for ConfigFile {
3030
3131 fn try_into ( self ) -> std:: result:: Result < Config , Self :: Error > {
3232 match self {
33- Self :: V01 ( x) => Ok ( x. try_into ( ) ? ) ,
33+ Self :: V01 ( x) => Ok ( x) ,
3434 }
3535 }
3636}
3737
3838impl ConfigFile {
3939 pub fn config_from_str ( input : & str ) -> Result < Config > {
40- Ok ( toml:: from_str :: < ConfigFile > ( input) ?. try_into ( ) ? )
40+ toml:: from_str :: < ConfigFile > ( input) ?. try_into ( )
4141 }
4242
4343 pub fn config_from_file ( file : & Path ) -> Result < Config > {
You can’t perform that action at this time.
0 commit comments