From 93c605418568bf71bcc3be6956f07f9650b45fea Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Sat, 11 Apr 2020 12:29:22 -0700 Subject: Merge config_set function into commands.rs As a next step moving us closer towards removing the args module, this change merges the config_set function into the existing function of the same name in the commands module. --- src/args.rs | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/args.rs') diff --git a/src/args.rs b/src/args.rs index 3a1f2c8..d0b2a88 100644 --- a/src/args.rs +++ b/src/args.rs @@ -22,7 +22,6 @@ use std::io; use std::result; use crate::arg_defs; -use crate::commands; use crate::error::Error; use crate::RunCtx; @@ -68,20 +67,6 @@ impl<'io> Stdio for ExecCtx<'io> { } } -pub fn config_set(ctx: &mut ExecCtx<'_>, args: arg_defs::ConfigSetArgs) -> Result<()> { - let numlock = arg_defs::ConfigOption::try_from(args.no_numlock, args.numlock, "numlock")?; - let capslock = arg_defs::ConfigOption::try_from(args.no_capslock, args.capslock, "capslock")?; - let scrollock = arg_defs::ConfigOption::try_from(args.no_scrollock, args.scrollock, "scrollock")?; - let otp_pin = if args.otp_pin { - Some(true) - } else if args.no_otp_pin { - Some(false) - } else { - None - }; - commands::config_set(ctx, numlock, capslock, scrollock, otp_pin) -} - /// Parse the command-line arguments and execute the selected command. pub(crate) fn handle_arguments(ctx: &mut RunCtx<'_>, args: Vec) -> Result<()> { use structopt::StructOpt; -- cgit v1.2.1