diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-01-20 22:16:36 +0100 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-01-20 22:17:37 +0100 |
commit | 8c57d3ace0215adb3cd5edd0f18e8cc513f65ff1 (patch) | |
tree | 27eb8ac46b130e08d917a7b91da8b48a14b644b6 /src/config.rs | |
parent | 5da2735cfb8ccfaea1ebdee850ddd9fbd0bfb003 (diff) | |
parent | d87859975dc158919ecd5bf11a1111a2da5fcb30 (diff) | |
download | nitrokey-rs-8c57d3ace0215adb3cd5edd0f18e8cc513f65ff1.tar.gz nitrokey-rs-8c57d3ace0215adb3cd5edd0f18e8cc513f65ff1.tar.bz2 |
Merge branch 'feature/error-refactoring' into next
RFC: https://lists.sr.ht/~ireas/nitrokey-rs-dev/%3C20190117000856.slgb6jwkwd3qu6ey%40localhost%3E
Diffstat (limited to 'src/config.rs')
-rw-r--r-- | src/config.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/config.rs b/src/config.rs index 2ce6f77..6aa6d10 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,4 +1,4 @@ -use crate::util::CommandError; +use crate::error::{Error, LibraryError}; /// The configuration for a Nitrokey. #[derive(Clone, Copy, Debug, PartialEq)] @@ -35,13 +35,13 @@ fn config_otp_slot_to_option(value: u8) -> Option<u8> { None } -fn option_to_config_otp_slot(value: Option<u8>) -> Result<u8, CommandError> { +fn option_to_config_otp_slot(value: Option<u8>) -> Result<u8, Error> { match value { Some(value) => { if value < 3 { Ok(value) } else { - Err(CommandError::InvalidSlot) + Err(LibraryError::InvalidSlot.into()) } } None => Ok(255), @@ -66,7 +66,7 @@ impl Config { } impl RawConfig { - pub fn try_from(config: Config) -> Result<RawConfig, CommandError> { + pub fn try_from(config: Config) -> Result<RawConfig, Error> { Ok(RawConfig { numlock: option_to_config_otp_slot(config.numlock)?, capslock: option_to_config_otp_slot(config.capslock)?, |