File tree 1 file changed +5
-5
lines changed 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ fn main() {
33
33
}
34
34
35
35
fn try_main ( ) -> Result < ( ) > {
36
- let args = Args :: parse ( ) ?;
36
+ let Some ( args) = Args :: parse ( ) ? else { return Ok ( ( ) ) } ;
37
37
38
38
let mut stdout = BufWriter :: new ( io:: stdout ( ) . lock ( ) ) ; // Buffered because it is written with newline many times.
39
39
match args. merged {
@@ -153,7 +153,7 @@ impl FromStr for Merged {
153
153
}
154
154
155
155
impl Args {
156
- fn parse ( ) -> Result < Self > {
156
+ fn parse ( ) -> Result < Option < Self > > {
157
157
let mut format: Option < Format > = None ;
158
158
let mut merged: Option < Merged > = None ;
159
159
@@ -164,16 +164,16 @@ impl Args {
164
164
Long ( "merged" ) if merged. is_none ( ) => merged = Some ( parser. value ( ) ?. parse ( ) ?) ,
165
165
Short ( 'h' ) | Long ( "help" ) => {
166
166
print ! ( "{USAGE}" ) ;
167
- std :: process :: exit ( 0 ) ;
167
+ return Ok ( None ) ;
168
168
}
169
169
Short ( 'V' ) | Long ( "version" ) => {
170
170
println ! ( "{} {}" , env!( "CARGO_PKG_NAME" ) , env!( "CARGO_PKG_VERSION" ) ) ;
171
- std :: process :: exit ( 0 ) ;
171
+ return Ok ( None ) ;
172
172
}
173
173
_ => return Err ( arg. unexpected ( ) . into ( ) ) ,
174
174
}
175
175
}
176
176
177
- Ok ( Self { format : format. unwrap_or_default ( ) , merged : merged. unwrap_or_default ( ) } )
177
+ Ok ( Some ( Self { format : format. unwrap_or_default ( ) , merged : merged. unwrap_or_default ( ) } ) )
178
178
}
179
179
}
You can’t perform that action at this time.
0 commit comments