@@ -224,14 +224,23 @@ pub struct Opt {
224
224
}
225
225
226
226
impl LockMode {
227
- fn from_lock_opts ( update : bool , reinstall : bool ) -> Self {
227
+ fn from_lock_flags ( update : bool , reinstall : bool ) -> Self {
228
228
match ( update, reinstall) {
229
+ ( false , false ) => Self :: Normal ,
229
230
( true , false ) => Self :: Update ,
230
231
( false , true ) => Self :: Reinstall ,
231
- ( false , false ) => Self :: Normal ,
232
232
( true , true ) => unreachable ! ( ) ,
233
233
}
234
234
}
235
+
236
+ fn from_source_flags ( relock : bool , update : bool , reinstall : bool ) -> ( bool , Self ) {
237
+ match ( relock, update, reinstall) {
238
+ ( relock, false , false ) => ( relock, Self :: Normal ) ,
239
+ ( _, true , false ) => ( true , Self :: Update ) ,
240
+ ( _, false , true ) => ( true , Self :: Reinstall ) ,
241
+ ( _, true , true ) => unreachable ! ( ) ,
242
+ }
243
+ }
235
244
}
236
245
237
246
impl Plugin {
@@ -350,15 +359,15 @@ impl Opt {
350
359
RawCommand :: Edit => Command :: Edit ,
351
360
RawCommand :: Remove { name } => Command :: Remove { name } ,
352
361
RawCommand :: Lock { update, reinstall } => {
353
- let mode = LockMode :: from_lock_opts ( update, reinstall) ;
362
+ let mode = LockMode :: from_lock_flags ( update, reinstall) ;
354
363
Command :: Lock { mode }
355
364
}
356
365
RawCommand :: Source {
357
366
relock,
358
367
update,
359
368
reinstall,
360
369
} => {
361
- let mode = LockMode :: from_lock_opts ( update, reinstall) ;
370
+ let ( relock , mode) = LockMode :: from_source_flags ( relock , update, reinstall) ;
362
371
Command :: Source { relock, mode }
363
372
}
364
373
} ;
0 commit comments