File tree Expand file tree Collapse file tree 2 files changed +19
-15
lines changed
Expand file tree Collapse file tree 2 files changed +19
-15
lines changed Original file line number Diff line number Diff line change @@ -809,8 +809,9 @@ impl<'de: 'a, 'a> DeserializeSeed<'de> for SetGroupsDeserializerReturn<'a> {
809809 Ok ( ( Some ( DGroups :: Single ( group) ) , score, ok) )
810810 }
811811 fn visit_str < E > ( self , v : & str ) -> Result < Self :: Value , E >
812- where
813- E : serde:: de:: Error , {
812+ where
813+ E : serde:: de:: Error ,
814+ {
814815 debug ! ( "SGroupsChooserVisitor: visit_str" ) ;
815816 self . visit_string ( v. to_string ( ) )
816817 }
@@ -1046,14 +1047,16 @@ impl<'de: 'a, 'a> DeserializeSeed<'de> for SetUserDeserializerReturn<'a> {
10461047 Ok ( ( Some ( user) , score, ok) )
10471048 }
10481049 fn visit_str < E > ( self , v : & str ) -> Result < Self :: Value , E >
1049- where
1050- E : serde:: de:: Error , {
1050+ where
1051+ E : serde:: de:: Error ,
1052+ {
10511053 debug ! ( "SetUserVisitor: visit_str" ) ;
10521054 self . visit_string ( v. to_string ( ) )
10531055 }
10541056 fn visit_string < E > ( self , v : String ) -> Result < Self :: Value , E >
1055- where
1056- E : serde:: de:: Error , {
1057+ where
1058+ E : serde:: de:: Error ,
1059+ {
10571060 debug ! ( "SetUserVisitor: visit_string" ) ;
10581061 let user = if let Ok ( uid) = v. parse :: < u32 > ( ) {
10591062 DUserType :: from ( uid)
Original file line number Diff line number Diff line change @@ -186,18 +186,19 @@ impl BestExecSettings {
186186 debug ! ( "default behavior is all" ) ;
187187 let t_env_path = opt_stack. calc_path ( env_path) ;
188188 found = true ;
189- println ! ( "{:?}" , & cli. cmd_path) ;
189+ println ! ( "{:?}" , & cli. cmd_path) ;
190190 if let Ok ( path) = cli. cmd_path . canonicalize ( ) {
191191 self . final_path = path;
192192 } else {
193- self . final_path =
194- all_paths_from_env (
195- & t_env_path. iter ( ) . map ( |s| s. as_str ( ) ) . collect :: < Vec < _ > > ( ) ,
196- & cli. cmd_path ,
197- )
198- . first ( )
199- . ok_or_else :: < Box < dyn std:: error:: Error > , _ > ( || "No path found" . to_string ( ) . into ( ) ) ?
200- . to_path_buf ( ) ;
193+ self . final_path = all_paths_from_env (
194+ & t_env_path. iter ( ) . map ( |s| s. as_str ( ) ) . collect :: < Vec < _ > > ( ) ,
195+ & cli. cmd_path ,
196+ )
197+ . first ( )
198+ . ok_or_else :: < Box < dyn std:: error:: Error > , _ > ( || {
199+ "No path found" . to_string ( ) . into ( )
200+ } ) ?
201+ . to_path_buf ( ) ;
201202 }
202203 self . score . cmd_min = CmdMin :: FullWildcardPath | CmdMin :: RegexArgs ;
203204 } else {
You can’t perform that action at this time.
0 commit comments