Run Rustfmt

Author: josephlr

benches/mod.rs

@@ -1,13 +1,13 @@
 #![feature(test)]
-extern crate test;
 extern crate getrandom;
+extern crate test;
 
 #[bench]
 fn bench_64(b: &mut test::Bencher) {
     let mut buf = [0u8; 64];
     b.iter(|| {
         getrandom::getrandom(&mut buf[..]).unwrap();
-        test::black_box(&buf);        
+        test::black_box(&buf);
     });
     b.bytes = buf.len() as u64;
 }
@@ -17,8 +17,7 @@ fn bench_65536(b: &mut test::Bencher) {
     let mut buf = [0u8; 65536];
     b.iter(|| {
         getrandom::getrandom(&mut buf[..]).unwrap();
-        test::black_box(&buf);        
+        test::black_box(&buf);
     });
     b.bytes = buf.len() as u64;
 }
-

src/error.rs

@@ -5,9 +5,9 @@
 // <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 core::num::NonZeroU32;
 use core::convert::From;
 use core::fmt;
+use core::num::NonZeroU32;
 
 // A randomly-chosen 24-bit prefix for our codes
 pub(crate) const CODE_PREFIX: u32 = 0x57f4c500;
@@ -22,14 +22,10 @@ pub struct Error(pub(crate) NonZeroU32);
 
 impl Error {
     /// An unknown error.
-    pub const UNKNOWN: Error = Error(unsafe {
-        NonZeroU32::new_unchecked(CODE_UNKNOWN)
-    });
+    pub const UNKNOWN: Error = Error(unsafe { NonZeroU32::new_unchecked(CODE_UNKNOWN) });
 
     /// No generator is available.
-    pub const UNAVAILABLE: Error = Error(unsafe {
-        NonZeroU32::new_unchecked(CODE_UNAVAILABLE)
-    });
+    pub const UNAVAILABLE: Error = Error(unsafe { NonZeroU32::new_unchecked(CODE_UNAVAILABLE) });
 
     /// Extract the error code.
     ///
@@ -48,7 +44,7 @@ impl Error {
             match *self {
                 Error::UNKNOWN => Some("getrandom: unknown error"),
                 Error::UNAVAILABLE => Some("getrandom: unavailable"),
-                _ => None
+                _ => None,
             }
         }
     }
@@ -80,8 +76,8 @@ impl From<NonZeroU32> for Error {
 
 #[cfg(test)]
 mod tests {
-    use core::mem::size_of;
     use super::Error;
+    use core::mem::size_of;
 
     #[test]
     fn test_size() {

src/error_impls.rs

@@ -7,10 +7,10 @@
 // except according to those terms.
 extern crate std;
 
-use std::{io, error};
+use crate::error::Error;
 use core::convert::From;
 use core::num::NonZeroU32;
-use crate::error::Error;
+use std::{error, io};
 
 impl From<io::Error> for Error {
     fn from(err: io::Error) -> Self {
@@ -31,4 +31,4 @@ impl From<Error> for io::Error {
     }
 }
 
-impl error::Error for Error { }
+impl error::Error for Error {}

src/lib.rs

@@ -45,10 +45,10 @@
 //! features are activated for this crate. Note that if both features are
 //! enabled `wasm-bindgen` will be used. If neither feature is enabled,
 //! `getrandom` will always fail.
-//! 
+//!
 //! The WASI target `wasm32-wasi` uses the `__wasi_random_get` function defined
 //! by the WASI standard.
-//! 
+//!
 //!
 //! ## Early boot
 //!
@@ -115,23 +115,28 @@
 //! [16]: #support-for-webassembly-and-amsjs
 //! [17]: https://github.com/CraneStation/wasmtime/blob/master/docs/WASI-api.md#__wasi_random_get
 
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://rust-random.github.io/rand/")]
+#![doc(
+    html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+    html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+    html_root_url = "https://rust-random.github.io/rand/"
+)]
 #![no_std]
-#![cfg_attr(feature = "stdweb", recursion_limit="128")]
+#![cfg_attr(feature = "stdweb", recursion_limit = "128")]
 
 #[cfg(feature = "log")]
 #[macro_use]
 extern crate log;
 #[cfg(not(feature = "log"))]
 #[allow(unused)]
-macro_rules! error { ($($x:tt)*) => () }
+macro_rules! error {
+    ($($x:tt)*) => {};
+}
 
 // temp fix for stdweb
 #[cfg(target_arch = "wasm32")]
 extern crate std;
 
+mod error;
 #[cfg(any(
     target_os = "android",
     target_os = "netbsd",
@@ -141,13 +146,9 @@ extern crate std;
     target_os = "dragonfly",
     target_os = "haiku",
     target_os = "linux",
-    all(
-        target_arch = "wasm32", 
-        not(target_os = "wasi")
-    ),
+    all(target_arch = "wasm32", not(target_os = "wasi")),
 ))]
 mod utils;
-mod error;
 pub use crate::error::Error;
 
 // System-specific implementations.
@@ -159,13 +160,14 @@ macro_rules! mod_use {
         #[$cond]
         mod $module;
         #[$cond]
-        use crate::$module::{getrandom_inner, error_msg_inner};
-    }
+        use crate::$module::{error_msg_inner, getrandom_inner};
+    };
 }
 
 #[cfg(any(
     feature = "std",
-    windows, unix,
+    windows,
+    unix,
     target_os = "cloudabi",
     target_os = "redox",
     target_arch = "wasm32",
@@ -246,7 +248,6 @@ mod_use!(
     dummy
 );
 
-
 /// Fill `dest` with random bytes from the system's preferred random number
 /// source.
 ///

src/utils.rs

@@ -12,9 +12,14 @@ use core::ops::DerefMut;
 /// If `f` contains `Some(T)` call `use_f` using contents of `f` as an argument,
 /// otherwise initialize `f` value using `init_f`, store resulting value in `f`
 /// and call `use_f`.
-pub(crate) fn use_init<T, F, U>(f: &RefCell<Option<T>>, init_f: F, mut use_f: U)
-    -> Result<(), Error>
-    where F: FnOnce() -> Result<T, Error>, U: FnMut(&mut T) -> Result<(), Error>
+pub(crate) fn use_init<T, F, U>(
+    f: &RefCell<Option<T>>,
+    init_f: F,
+    mut use_f: U,
+) -> Result<(), Error>
+where
+    F: FnOnce() -> Result<T, Error>,
+    U: FnMut(&mut T) -> Result<(), Error>,
 {
     let mut f = f.borrow_mut();
     let f: &mut Option<T> = f.deref_mut();

tests/mod.rs

@@ -31,18 +31,18 @@ fn test_huge() {
     getrandom(&mut huge).unwrap();
 }
 
-#[cfg(any(unix, windows, target_os="redox", target_os = "fuchsia"))]
+#[cfg(any(unix, windows, target_os = "redox", target_os = "fuchsia"))]
 #[test]
 fn test_multithreading() {
     use std::sync::mpsc::channel;
     use std::thread;
 
-    let mut txs = vec!();
+    let mut txs = vec![];
     for _ in 0..20 {
         let (tx, rx) = channel();
         txs.push(tx);
 
-        thread::spawn(move|| {
+        thread::spawn(move || {
             // wait until all the tasks are ready to go.
             rx.recv().unwrap();
             let mut v = [0u8; 1000];

tests/wasm_bindgen/src/lib.rs

@@ -15,8 +15,8 @@ extern crate wasm_bindgen;
 extern crate wasm_bindgen_test;
 
 use std::slice;
-use wasm_bindgen_test::*;
 use wasm_bindgen::prelude::*;
+use wasm_bindgen_test::*;
 
 use getrandom::getrandom;