aboutsummaryrefslogtreecommitdiff
path: root/getrandom/src/error_impls.rs
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2020-01-02 08:32:06 -0800
committerDaniel Mueller <deso@posteo.net>2020-01-02 08:32:06 -0800
commitfd091b04316db9dc5fafadbd6bdbe60b127408a9 (patch)
treef202270f7ae5cedc513be03833a26148d9b5e219 /getrandom/src/error_impls.rs
parent8161cdb26f98e65b39c603ddf7a614cc87c77a1c (diff)
downloadnitrocli-fd091b04316db9dc5fafadbd6bdbe60b127408a9.tar.gz
nitrocli-fd091b04316db9dc5fafadbd6bdbe60b127408a9.tar.bz2
Update nitrokey crate to 0.4.0
This change finally updates the version of the nitrokey crate that we consume to 0.4.0. Along with that we update rand_core, one of its dependencies, to 0.5.1. Further more we add cfg-if in version 0.1.10 and getrandom in version 0.1.13, both of which are now new (non-development) dependencies. Import subrepo nitrokey/:nitrokey at e81057037e9b4f370b64c0a030a725bc6bdfb870 Import subrepo cfg-if/:cfg-if at 4484a6faf816ff8058088ad857b0c6bb2f4b02b2 Import subrepo getrandom/:getrandom at d661aa7e1b8cc80b47dabe3d2135b3b47d2858af Import subrepo rand/:rand at d877ed528248b52d947e0484364a4e1ae59ca502
Diffstat (limited to 'getrandom/src/error_impls.rs')
-rw-r--r--getrandom/src/error_impls.rs35
1 files changed, 35 insertions, 0 deletions
diff --git a/getrandom/src/error_impls.rs b/getrandom/src/error_impls.rs
new file mode 100644
index 0000000..007472e
--- /dev/null
+++ b/getrandom/src/error_impls.rs
@@ -0,0 +1,35 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+extern crate std;
+
+use crate::{error::UNKNOWN_IO_ERROR, Error};
+use core::convert::From;
+use core::num::NonZeroU32;
+use std::io;
+
+impl From<io::Error> for Error {
+ fn from(err: io::Error) -> Self {
+ if let Some(errno) = err.raw_os_error() {
+ if let Some(code) = NonZeroU32::new(errno as u32) {
+ return Error::from(code);
+ }
+ }
+ UNKNOWN_IO_ERROR
+ }
+}
+
+impl From<Error> for io::Error {
+ fn from(err: Error) -> Self {
+ match err.raw_os_error() {
+ Some(errno) => io::Error::from_raw_os_error(errno),
+ None => io::Error::new(io::ErrorKind::Other, err),
+ }
+ }
+}
+
+impl std::error::Error for Error {}