rust: run rustfmt

3 files changed, 39 insertions, 28 deletions

diff --git a/src/rust/crypto/digests/sha2.rs b/src/rust/crypto/digests/sha2.rs
index d0246eeb94..55d0027665 100644
--- a/src/rust/crypto/digests/sha2.rs
+++ b/src/rust/crypto/digests/sha2.rs
@@ -6,17 +6,17 @@
 
 pub use digest::Digest;
 
+use digest::generic_array::typenum::U32;
+use digest::generic_array::typenum::U64;
+use digest::generic_array::GenericArray;
 use digest::BlockInput;
 use digest::FixedOutput;
 use digest::Input;
-use digest::generic_array::GenericArray;
-use digest::generic_array::typenum::U32;
-use digest::generic_array::typenum::U64;
 
-use external::crypto_digest::CryptoDigest;
-use external::crypto_digest::DigestAlgorithm;
 use external::crypto_digest::get_256_bit_digest;
 use external::crypto_digest::get_512_bit_digest;
+use external::crypto_digest::CryptoDigest;
+use external::crypto_digest::DigestAlgorithm;
 
 pub use external::crypto_digest::DIGEST256_LEN;
 pub use external::crypto_digest::DIGEST512_LEN;
@@ -54,7 +54,9 @@ pub struct Sha256 {
 /// A new `Sha256` digest.
 impl Default for Sha256 {
     fn default() -> Sha256 {
-        Sha256{ engine: CryptoDigest::new(Some(DigestAlgorithm::SHA2_256)) }
+        Sha256 {
+            engine: CryptoDigest::new(Some(DigestAlgorithm::SHA2_256)),
+        }
     }
 }
 
@@ -121,7 +123,9 @@ pub struct Sha512 {
 /// A new `Sha512` digest.
 impl Default for Sha512 {
     fn default() -> Sha512 {
-        Sha512{ engine: CryptoDigest::new(Some(DigestAlgorithm::SHA2_512)) }
+        Sha512 {
+            engine: CryptoDigest::new(Some(DigestAlgorithm::SHA2_512)),
+        }
     }
 }
 
@@ -182,9 +186,10 @@ mod test {
     fn sha256_digest() {
         let mut h: Sha256 = Sha256::new();
         let mut result: [u8; DIGEST256_LEN] = [0u8; DIGEST256_LEN];
-        let expected = [151, 223, 53, 136, 181, 163, 242, 75, 171, 195,
-                        133, 27, 55, 47, 11, 167, 26, 157, 205, 222, 212,
-                        59, 20, 185, 208, 105, 97, 191, 193, 112, 125, 157];
+        let expected = [
+            151, 223, 53, 136, 181, 163, 242, 75, 171, 195, 133, 27, 55, 47, 11, 167, 26, 157, 205,
+            222, 212, 59, 20, 185, 208, 105, 97, 191, 193, 112, 125, 157,
+        ];
 
         h.input(b"foo");
         h.input(b"bar");
@@ -209,11 +214,12 @@ mod test {
         let mut h: Sha512 = Sha512::new();
         let mut result: [u8; DIGEST512_LEN] = [0u8; DIGEST512_LEN];
 
-        let expected = [203, 55, 124, 16, 176, 245, 166, 44, 128, 54, 37, 167,
-                153, 217, 233, 8, 190, 69, 231, 103, 245, 209, 71, 212, 116,
-                73, 7, 203, 5, 89, 122, 164, 237, 211, 41, 160, 175, 20, 122,
-                221, 12, 244, 24, 30, 211, 40, 250, 30, 121, 148, 38, 88, 38,
-                179, 237, 61, 126, 246, 240, 103, 202, 153, 24, 90];
+        let expected = [
+            203, 55, 124, 16, 176, 245, 166, 44, 128, 54, 37, 167, 153, 217, 233, 8, 190, 69, 231,
+            103, 245, 209, 71, 212, 116, 73, 7, 203, 5, 89, 122, 164, 237, 211, 41, 160, 175, 20,
+            122, 221, 12, 244, 24, 30, 211, 40, 250, 30, 121, 148, 38, 88, 38, 179, 237, 61, 126,
+            246, 240, 103, 202, 153, 24, 90,
+        ];
 
         h.input(b"foo");
         h.input(b"bar");
diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs
index 3b58935fda..4eceb4cbd1 100644
--- a/src/rust/crypto/lib.rs
+++ b/src/rust/crypto/lib.rs
@@ -42,5 +42,5 @@ extern crate external;
 #[macro_use]
 extern crate tor_log;
 
-pub mod digests;  // Unfortunately named "digests" plural to avoid name conflict with the digest crate
+pub mod digests; // Unfortunately named "digests" plural to avoid name conflict with the digest crate
 pub mod rand;
diff --git a/src/rust/crypto/rand/rng.rs b/src/rust/crypto/rand/rng.rs
index 07a0a7bdc7..64ceb22424 100644
--- a/src/rust/crypto/rand/rng.rs
+++ b/src/rust/crypto/rand/rng.rs
@@ -12,15 +12,15 @@
 mod internal {
     use std::u64;
 
+    use rand_core::impls::next_u32_via_fill;
+    use rand_core::impls::next_u64_via_fill;
     use rand_core::CryptoRng;
     use rand_core::Error;
     use rand_core::RngCore;
-    use rand_core::impls::next_u32_via_fill;
-    use rand_core::impls::next_u64_via_fill;
 
     use external::c_tor_crypto_rand;
-    use external::c_tor_crypto_strongest_rand;
     use external::c_tor_crypto_seed_rng;
+    use external::c_tor_crypto_strongest_rand;
 
     use tor_log::LogDomain;
     use tor_log::LogSeverity;
@@ -45,12 +45,15 @@ mod internal {
         #[allow(dead_code)]
         pub fn new() -> Self {
             if !c_tor_crypto_seed_rng() {
-                tor_log_msg!(LogSeverity::Warn, LogDomain::General,
-                             "TorRng::from_seed()",
-                             "The RNG could not be seeded!");
+                tor_log_msg!(
+                    LogSeverity::Warn,
+                    LogDomain::General,
+                    "TorRng::from_seed()",
+                    "The RNG could not be seeded!"
+                );
             }
             // XXX also log success at info level —isis
-            TorRng{ _unused: [0u8; 0] }
+            TorRng { _unused: [0u8; 0] }
         }
     }
 
@@ -92,12 +95,15 @@ mod internal {
         #[allow(dead_code)]
         pub fn new() -> Self {
             if !c_tor_crypto_seed_rng() {
-                tor_log_msg!(LogSeverity::Warn, LogDomain::General,
-                             "TorStrongestRng::from_seed()",
-                             "The RNG could not be seeded!");
+                tor_log_msg!(
+                    LogSeverity::Warn,
+                    LogDomain::General,
+                    "TorStrongestRng::from_seed()",
+                    "The RNG could not be seeded!"
+                );
             }
             // XXX also log success at info level —isis
-            TorStrongestRng{ _unused: [0u8; 0] }
+            TorStrongestRng { _unused: [0u8; 0] }
         }
     }
 
@@ -137,4 +143,3 @@ mod internal {
 // Finally, expose the public functionality of whichever appropriate internal
 // module.
 pub use self::internal::*;
-