aboutsummaryrefslogtreecommitdiff
path: root/src/util.rs
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2020-08-30 19:09:17 +0200
committerRobin Krahl <robin.krahl@ireas.org>2020-08-30 19:09:17 +0200
commit21de2b96335b3cfcaea9b96592fe5eef34f81126 (patch)
tree1d2b82d3e8be6d86890d5292ac02cb6e54605252 /src/util.rs
parent3810761847717676d91900c422d9c8b634f56d77 (diff)
parent1d36e2e1195fc9046e36f38dfe943198027e84ca (diff)
downloadnitrokey-rs-21de2b96335b3cfcaea9b96592fe5eef34f81126.tar.gz
nitrokey-rs-21de2b96335b3cfcaea9b96592fe5eef34f81126.tar.bz2
Merge branch 'release-v0.7.1'HEADmaster
Diffstat (limited to 'src/util.rs')
-rw-r--r--src/util.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.rs b/src/util.rs
index b17b071..26942cf 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -99,7 +99,7 @@ pub fn generate_password(length: usize) -> Result<CString, Error> {
}
pub fn get_cstring<T: Into<Vec<u8>>>(s: T) -> Result<CString, Error> {
- CString::new(s).or_else(|_| Err(LibraryError::InvalidString.into()))
+ CString::new(s).map_err(|_| LibraryError::InvalidString.into())
}
impl Into<i32> for LogLevel {