Remove error module from API

Author: dhardy

src/cloudabi.rs

@@ -11,7 +11,7 @@
 extern crate cloudabi;
 
 use core::num::NonZeroU32;
-use error::Error;
+use Error;
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     let errno = unsafe { cloudabi::random_get(dest) };

src/dragonfly_haiku.rs

@@ -7,7 +7,7 @@
 // except according to those terms.
 
 //! Implementation for DragonFly / Haiku
-use error::Error;
+use Error;
 use utils::use_init;
 use std::fs::File;
 use std::io::Read;

src/dummy.rs

@@ -7,12 +7,12 @@
 // except according to those terms.
 
 //! A dummy implementation for unsupported targets which always returns
-//! `Err(error::UNAVAILABLE)`
+//! `Err(ERROR_UNAVAILABLE)`
 use std::num::NonZeroU32;
-use error::{Error, UNAVAILABLE};
+use {Error, ERROR_UNAVAILABLE};
 
 pub fn getrandom_inner(_: &mut [u8]) -> Result<(), Error> {
-    Err(UNAVAILABLE)
+    Err(ERROR_UNAVAILABLE)
 }
 
 #[inline(always)]

src/emscripten.rs

@@ -7,7 +7,7 @@
 // except according to those terms.
 
 //! Implementation for Emscripten
-use error::Error;
+use Error;
 use std::fs::File;
 use std::io::Read;
 use std::cell::RefCell;

src/error.rs

@@ -18,16 +18,16 @@ const CODE_UNKNOWN: u32 = CODE_PREFIX | 0;
 const CODE_UNAVAILABLE: u32 = CODE_PREFIX | 1;
 
 /// An unknown error.
-pub const UNKNOWN: Error = Error(unsafe {
 /// 
 /// This is the following constant: 57F40000 (hex) / 1475608576 (decimal).
+pub const ERROR_UNKNOWN: Error = Error(unsafe {
     NonZeroU32::new_unchecked(CODE_UNKNOWN)
 });
 
 /// No generator is available.
-pub const UNAVAILABLE: Error = Error(unsafe {
 /// 
 /// This is the following constant: 57F40001 (hex) / 1475608577 (decimal).
+pub const ERROR_UNAVAILABLE: Error = Error(unsafe {
     NonZeroU32::new_unchecked(CODE_UNAVAILABLE)
 });
 
@@ -53,8 +53,8 @@ impl Error {
             Some(msg)
         } else {
             match *self {
-                UNKNOWN => Some("getrandom: unknown error"),
-                UNAVAILABLE => Some("getrandom: unavailable"),
+                ERROR_UNKNOWN => Some("getrandom: unknown error"),
+                ERROR_UNAVAILABLE => Some("getrandom: unavailable"),
                 _ => None
             }
         }
@@ -92,7 +92,7 @@ impl From<io::Error> for Error {
             .and_then(|code| NonZeroU32::new(code as u32))
             .map(|code| Error(code))
             // in practice this should never happen
-            .unwrap_or(UNKNOWN)
+            .unwrap_or(ERROR_UNKNOWN)
     }
 }
 

src/freebsd.rs

@@ -9,7 +9,7 @@
 //! Implementation for FreeBSD
 extern crate libc;
 
-use error::Error;
+use Error;
 use core::ptr;
 use std::io;
 use std::num::NonZeroU32;

src/fuchsia.rs

@@ -10,7 +10,7 @@
 extern crate fuchsia_cprng;
 
 use std::num::NonZeroU32;
-use error::Error;
+use Error;
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     fuchsia_cprng::cprng_draw(dest);

src/lib.rs

@@ -123,8 +123,8 @@ extern crate wasm_bindgen;
     target_arch = "wasm32",
 ))]
 mod utils;
-pub mod error;
-
+mod error;
+pub use error::{Error, ERROR_UNKNOWN, ERROR_UNAVAILABLE};
 
 // System-specific implementations.
 // 

src/linux_android.rs

@@ -9,7 +9,7 @@
 //! Implementation for Linux / Android
 extern crate libc;
 
-use error::Error;
+use Error;
 use utils::use_init;
 use std::fs::File;
 use std::io;

src/macos.rs

@@ -9,7 +9,7 @@
 //! Implementation for MacOS / iOS
 extern crate libc;
 
-use error::Error;
+use Error;
 use std::io;
 use std::num::NonZeroU32;
 use self::libc::{c_int, size_t};

src/netbsd.rs

@@ -8,7 +8,7 @@
 
 //! Implementation for NetBSD
 
-use error::Error;
+use Error;
 use utils::use_init;
 use std::fs::File;
 use std::io::Read;

src/openbsd_bitrig.rs

@@ -9,7 +9,7 @@
 //! Implementation for OpenBSD / Bitrig
 extern crate libc;
 
-use error::Error;
+use Error;
 use std::io;
 use std::num::NonZeroU32;
 

src/redox.rs

@@ -7,7 +7,7 @@
 // except according to those terms.
 
 //! Implementation for Redox
-use error::Error;
+use Error;
 use utils::use_init;
 use std::fs::File;
 use std::io::Read;

src/sgx.rs

@@ -7,7 +7,7 @@
 // except according to those terms.
 
 //! Implementation for SGX using RDRAND instruction
-use error::{Error, UNKNOWN};
+use {Error, ERROR_UNKNOWN};
 
 use core::{mem, ptr};
 use core::arch::x86_64::_rdrand64_step;
@@ -27,7 +27,7 @@ fn get_rand_u64() -> Result<u64, Error> {
             }
         };
     }
-    Err(UNKNOWN)
+    Err(ERROR_UNKNOWN)
 }
 
 pub fn getrandom_inner(mut dest: &mut [u8]) -> Result<(), Error> {

src/solarish.rs

@@ -19,7 +19,7 @@
 //! libc::dlsym.
 extern crate libc;
 
-use error::Error;
+use Error;
 use std::cell::RefCell;
 use std::fs::File;
 use std::io;

src/utils.rs

@@ -5,7 +5,7 @@
 // <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.
-use error::Error;
+use Error;
 use core::cell::RefCell;
 use core::ops::DerefMut;
 

src/wasm32_bindgen.rs

@@ -15,7 +15,7 @@ use std::num::NonZeroU32;
 use wasm_bindgen::prelude::*;
 
 use __wbg_shims::*;
-use error::Error;
+use Error;
 use utils::use_init;
 
 const CODE_PREFIX: u32 = ::error::CODE_PREFIX | 0x8e00;

src/wasm32_stdweb.rs

@@ -15,7 +15,7 @@ use std::num::NonZeroU32;
 use stdweb::unstable::TryInto;
 use stdweb::web::error::Error as WebError;
 
-use error::{Error, UNAVAILABLE, UNKNOWN};
+use {Error, ERROR_UNAVAILABLE, ERROR_UNKNOWN};
 use utils::use_init;
 
 #[derive(Clone, Debug)]
@@ -66,7 +66,7 @@ fn getrandom_init() -> Result<RngSource, Error> {
         else { unreachable!() }
     } else {
         let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-        Err(UNAVAILABLE)  // TODO: forward err
+        Err(ERROR_UNAVAILABLE)  // TODO: forward err
     }
 }
 
@@ -101,7 +101,7 @@ fn getrandom_fill(source: &mut RngSource, dest: &mut [u8]) -> Result<(), Error>
 
         if js!{ return @{ result.as_ref() }.success } != true {
             let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-            return Err(UNKNOWN)  // TODO: forward err
+            return Err(ERROR_UNKNOWN)  // TODO: forward err
         }
     }
     Ok(())

src/windows.rs

@@ -14,7 +14,7 @@ use self::winapi::um::ntsecapi::RtlGenRandom;
 use self::winapi::um::winnt::PVOID;
 use std::io;
 use std::num::NonZeroU32;
-use error::Error;
+use Error;
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     let ret = unsafe {