diff options
| author | Robin Krahl <robin.krahl@ireas.org> | 2019-01-11 01:30:24 +0000 |
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2019-01-26 22:04:39 -0800 |
| commit | 9d854fc5baad01d059acdb96fad82700042ef114 (patch) | |
| tree | 842d276c2de5dfca2c70498eda63d6262043f32e /nitrocli/src/args.rs | |
| parent | 77ff522ba2ebee17eb56f52921f127fba2fbd7fb (diff) | |
| download | nitrocli-9d854fc5baad01d059acdb96fad82700042ef114.tar.gz nitrocli-9d854fc5baad01d059acdb96fad82700042ef114.tar.bz2 | |
Implement From<&str> for Error
This patch implements From<&str> for Error so that we can use
Error::from(s) as a shorthand for Error::Error(s.to_string()). It also
replaces Error::Error with Error::from where possible.
Diffstat (limited to 'nitrocli/src/args.rs')
| -rw-r--r-- | nitrocli/src/args.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs index 246490e..f4e0758 100644 --- a/nitrocli/src/args.rs +++ b/nitrocli/src/args.rs @@ -539,8 +539,8 @@ pub fn otp_set(ctx: &mut ExecCtx<'_>, args: Vec<String>) -> Result<()> { if ascii { if secret_format.is_some() { - return Err(Error::Error( - "The --format and the --ascii option cannot be used at the same time".to_string(), + return Err(Error::from( + "The --format and the --ascii option cannot be used at the same time", )); } |