Skip to content
This repository was archived by the owner on Nov 30, 2022. It is now read-only.

Commit 7abde5b

Browse files
apoelstraapoelstra
committed
Merge #144: Do manual rustfmt cleanups
d07e127 Fix unusual indentation (Tobin Harding) 2890e9e Refactor where statements (Tobin Harding) 971f4b0 Use spaces around = (Tobin Harding) 6852915 Do various whitespace fixes (Tobin Harding) 2d2b998 Remove unnecessary whitespace (Tobin Harding) 22897c2 Remove trailing whitespace (Tobin Harding) Pull request description: Use `rustfmt` to highlight areas in the code that can be cleaned up. All patches are refactor only, no logic changes. Non-urgent PR. ACKs for top commit: apoelstra: ACK d07e127 Tree-SHA512: deba1987401e841eb00c5ad89e7adc3aa04a7baf86efe9e48e0ecc6af1d8633ff8c0be5e37aac83059776b337153ce14aab234a371f81670851c4b18d027208e
2 parents 8ded24c + d07e127 commit 7abde5b

File tree

18 files changed

+114
-123
lines changed

18 files changed

+114
-123
lines changed

‎fuzz/fuzz_targets/cbor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ fn do_test(data: &[u8]) {
2727
}
2828
}
2929

30-
#[cfg(feature="honggfuzz")]
30+
#[cfg(feature = "honggfuzz")]
3131
#[macro_use]
3232
extern crate honggfuzz;
3333

34-
#[cfg(feature="honggfuzz")]
34+
#[cfg(feature = "honggfuzz")]
3535
fn main() {
3636
loop {
3737
fuzz!(|d| { do_test(d) });

‎fuzz/fuzz_targets/json.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ fn do_test(data: &[u8]) {
2727
}
2828
}
2929

30-
#[cfg(feature="honggfuzz")]
30+
#[cfg(feature = "honggfuzz")]
3131
#[macro_use]
3232
extern crate honggfuzz;
3333

34-
#[cfg(feature="honggfuzz")]
34+
#[cfg(feature = "honggfuzz")]
3535
fn main() {
3636
loop {
3737
fuzz!(|d| { do_test(d) });

‎fuzz/fuzz_targets/ripemd160.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ fn do_test(data: &[u8]) {
1818
assert_eq!(&our_hash[..], &rc_hash[..]);
1919
}
2020

21-
#[cfg(feature="honggfuzz")]
21+
#[cfg(feature = "honggfuzz")]
2222
#[macro_use]
2323
extern crate honggfuzz;
2424

25-
#[cfg(feature="honggfuzz")]
25+
#[cfg(feature = "honggfuzz")]
2626
fn main() {
2727
loop {
2828
fuzz!(|d| { do_test(d) });

‎fuzz/fuzz_targets/sha1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ fn do_test(data: &[u8]) {
1818
assert_eq!(&our_hash[..], &rc_hash[..]);
1919
}
2020

21-
#[cfg(feature="honggfuzz")]
21+
#[cfg(feature = "honggfuzz")]
2222
#[macro_use]
2323
extern crate honggfuzz;
2424

25-
#[cfg(feature="honggfuzz")]
25+
#[cfg(feature = "honggfuzz")]
2626
fn main() {
2727
loop {
2828
fuzz!(|d| { do_test(d) });

‎fuzz/fuzz_targets/sha256.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ fn do_test(data: &[u8]) {
1818
assert_eq!(&our_hash[..], &rc_hash[..]);
1919
}
2020

21-
#[cfg(feature="honggfuzz")]
21+
#[cfg(feature = "honggfuzz")]
2222
#[macro_use]
2323
extern crate honggfuzz;
2424

25-
#[cfg(feature="honggfuzz")]
25+
#[cfg(feature = "honggfuzz")]
2626
fn main() {
2727
loop {
2828
fuzz!(|d| { do_test(d) });

‎fuzz/fuzz_targets/sha512.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ fn do_test(data: &[u8]) {
1818
assert_eq!(&our_hash[..], &rc_hash[..]);
1919
}
2020

21-
#[cfg(feature="honggfuzz")]
21+
#[cfg(feature = "honggfuzz")]
2222
#[macro_use]
2323
extern crate honggfuzz;
2424

25-
#[cfg(feature="honggfuzz")]
25+
#[cfg(feature = "honggfuzz")]
2626
fn main() {
2727
loop {
2828
fuzz!(|d| { do_test(d) });

‎src/cmp.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ pub fn fixed_time_eq(a: &[u8], b: &[u8]) -> bool {
4444

4545
#[test]
4646
fn eq_test() {
47-
assert!( fixed_time_eq(&[0b00000000], &[0b00000000]));
48-
assert!( fixed_time_eq(&[0b00000001], &[0b00000001]));
49-
assert!( fixed_time_eq(&[0b00000010], &[0b00000010]));
50-
assert!( fixed_time_eq(&[0b00000100], &[0b00000100]));
51-
assert!( fixed_time_eq(&[0b00001000], &[0b00001000]));
52-
assert!( fixed_time_eq(&[0b00010000], &[0b00010000]));
53-
assert!( fixed_time_eq(&[0b00100000], &[0b00100000]));
54-
assert!( fixed_time_eq(&[0b01000000], &[0b01000000]));
55-
assert!( fixed_time_eq(&[0b10000000], &[0b10000000]));
56-
assert!( fixed_time_eq(&[0b11111111], &[0b11111111]));
47+
assert!(fixed_time_eq(&[0b00000000], &[0b00000000]));
48+
assert!(fixed_time_eq(&[0b00000001], &[0b00000001]));
49+
assert!(fixed_time_eq(&[0b00000010], &[0b00000010]));
50+
assert!(fixed_time_eq(&[0b00000100], &[0b00000100]));
51+
assert!(fixed_time_eq(&[0b00001000], &[0b00001000]));
52+
assert!(fixed_time_eq(&[0b00010000], &[0b00010000]));
53+
assert!(fixed_time_eq(&[0b00100000], &[0b00100000]));
54+
assert!(fixed_time_eq(&[0b01000000], &[0b01000000]));
55+
assert!(fixed_time_eq(&[0b10000000], &[0b10000000]));
56+
assert!(fixed_time_eq(&[0b11111111], &[0b11111111]));
5757

5858
assert!(!fixed_time_eq(&[0b00000001], &[0b00000000]));
5959
assert!(!fixed_time_eq(&[0b00000001], &[0b11111111]));
@@ -79,7 +79,7 @@ fn eq_test() {
7979
assert!(!fixed_time_eq(&[0b00000000, 0b00000000], &[0b00000001, 0b00000001]));
8080
}
8181

82-
#[cfg(all(test, feature="unstable"))]
82+
#[cfg(all(test, feature = "unstable"))]
8383
mod benches {
8484
use test::Bencher;
8585

‎src/hash160.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ use Error;
3333
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
3434
#[repr(transparent)]
3535
pub struct Hash(
36-
#[cfg_attr(feature = "schemars", schemars(schema_with="crate::util::json_hex_string::len_20"))]
36+
#[cfg_attr(feature = "schemars", schemars(schema_with = "crate::util::json_hex_string::len_20"))]
3737
[u8; 20]
3838
);
3939

40-
41-
4240
hex_fmt_impl!(Debug, Hash);
4341
hex_fmt_impl!(Display, Hash);
4442
hex_fmt_impl!(LowerHex, Hash);
@@ -159,7 +157,7 @@ mod tests {
159157
}
160158
}
161159

162-
#[cfg(feature="serde")]
160+
#[cfg(feature = "serde")]
163161
#[test]
164162
fn ripemd_serde() {
165163

@@ -179,7 +177,7 @@ mod tests {
179177
}
180178
}
181179

182-
#[cfg(all(test, feature="unstable"))]
180+
#[cfg(all(test, feature = "unstable"))]
183181
mod benches {
184182
use test::Bencher;
185183

@@ -188,7 +186,7 @@ mod benches {
188186
use HashEngine;
189187

190188
#[bench]
191-
pub fn hash160_10(bh: & mut Bencher) {
189+
pub fn hash160_10(bh: &mut Bencher) {
192190
let mut engine = hash160::Hash::engine();
193191
let bytes = [1u8; 10];
194192
bh.iter( || {
@@ -198,7 +196,7 @@ mod benches {
198196
}
199197

200198
#[bench]
201-
pub fn hash160_1k(bh: & mut Bencher) {
199+
pub fn hash160_1k(bh: &mut Bencher) {
202200
let mut engine = hash160::Hash::engine();
203201
let bytes = [1u8; 1024];
204202
bh.iter( || {
@@ -208,14 +206,12 @@ mod benches {
208206
}
209207

210208
#[bench]
211-
pub fn hash160_64k(bh: & mut Bencher) {
212-
209+
pub fn hash160_64k(bh: &mut Bencher) {
213210
let mut engine = hash160::Hash::engine();
214211
let bytes = [1u8; 65536];
215212
bh.iter( || {
216213
engine.input(&bytes);
217214
});
218215
bh.bytes = bytes.len() as u64;
219216
}
220-
221217
}

‎src/hex.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ pub trait ToHex {
6060
pub trait FromHex: Sized {
6161
/// Produce an object from a byte iterator
6262
fn from_byte_iter<I>(iter: I) -> Result<Self, Error>
63-
where I: Iterator<Item=Result<u8, Error>> +
64-
ExactSizeIterator +
65-
DoubleEndedIterator;
63+
where
64+
I: Iterator<Item = Result<u8, Error>> + ExactSizeIterator + DoubleEndedIterator;
6665

6766
/// Produce an object from a hex string
6867
fn from_hex(s: &str) -> Result<Self, Error> {
@@ -80,9 +79,8 @@ impl<T: fmt::LowerHex> ToHex for T {
8079

8180
impl<T: Hash> FromHex for T {
8281
fn from_byte_iter<I>(iter: I) -> Result<Self, Error>
83-
where I: Iterator<Item=Result<u8, Error>> +
84-
ExactSizeIterator +
85-
DoubleEndedIterator,
82+
where
83+
I: Iterator<Item = Result<u8, Error>> + ExactSizeIterator + DoubleEndedIterator,
8684
{
8785
let inner;
8886
if Self::DISPLAY_BACKWARD {
@@ -136,7 +134,7 @@ impl<'a> Iterator for HexIterator<'a> {
136134

137135
fn size_hint(&self) -> (usize, Option<usize>) {
138136
let (min, max) = self.iter.size_hint();
139-
(min / 2, max.map(|x| x /2))
137+
(min / 2, max.map(|x| x / 2))
140138
}
141139
}
142140

@@ -216,9 +214,8 @@ impl ToHex for [u8] {
216214
#[cfg(any(test, feature = "std", feature = "alloc"))]
217215
impl FromHex for Vec<u8> {
218216
fn from_byte_iter<I>(iter: I) -> Result<Self, Error>
219-
where I: Iterator<Item=Result<u8, Error>> +
220-
ExactSizeIterator +
221-
DoubleEndedIterator,
217+
where
218+
I: Iterator<Item = Result<u8, Error>> + ExactSizeIterator + DoubleEndedIterator,
222219
{
223220
iter.collect()
224221
}
@@ -228,9 +225,8 @@ macro_rules! impl_fromhex_array {
228225
($len:expr) => {
229226
impl FromHex for [u8; $len] {
230227
fn from_byte_iter<I>(iter: I) -> Result<Self, Error>
231-
where I: Iterator<Item=Result<u8, Error>> +
232-
ExactSizeIterator +
233-
DoubleEndedIterator,
228+
where
229+
I: Iterator<Item = Result<u8, Error>> + ExactSizeIterator + DoubleEndedIterator,
234230
{
235231
if iter.len() == $len {
236232
let mut ret = [0; $len];

‎src/hmac.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//! # HMAC support
2121
2222
use core::{borrow, fmt, ops, str};
23-
#[cfg(feature="serde")]
23+
#[cfg(feature = "serde")]
2424
use serde::{Serialize, Serializer, Deserialize, Deserializer};
2525

2626
use HashEngine as EngineTrait;
@@ -218,14 +218,14 @@ impl<T: HashTrait> HashTrait for Hmac<T> {
218218
}
219219
}
220220

221-
#[cfg(feature="serde")]
221+
#[cfg(feature = "serde")]
222222
impl<T: HashTrait + Serialize> Serialize for Hmac<T> {
223223
fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
224224
Serialize::serialize(&self.0, s)
225225
}
226226
}
227227

228-
#[cfg(feature="serde")]
228+
#[cfg(feature = "serde")]
229229
impl<'de, T: HashTrait + Deserialize<'de>> Deserialize<'de> for Hmac<T> {
230230
fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Hmac<T>, D::Error> {
231231
let inner = Deserialize::deserialize(d)?;
@@ -236,7 +236,7 @@ impl<'de, T: HashTrait + Deserialize<'de>> Deserialize<'de> for Hmac<T> {
236236
#[cfg(test)]
237237
mod tests {
238238
use sha256;
239-
#[cfg(feature="serde")] use sha512;
239+
#[cfg(feature = "serde")] use sha512;
240240
use {Hash, HashEngine, Hmac, HmacEngine};
241241

242242
#[derive(Clone)]
@@ -361,7 +361,7 @@ mod tests {
361361
}
362362
}
363363

364-
#[cfg(feature="serde")]
364+
#[cfg(feature = "serde")]
365365
#[test]
366366
fn hmac_sha512_serde() {
367367
use serde_test::{Configure, Token, assert_tokens};
@@ -389,15 +389,15 @@ mod tests {
389389
}
390390
}
391391

392-
#[cfg(all(test, feature="unstable"))]
392+
#[cfg(all(test, feature = "unstable"))]
393393
mod benches {
394394
use test::Bencher;
395395

396396
use sha256;
397397
use {Hmac, Hash, HashEngine};
398398

399399
#[bench]
400-
pub fn hmac_sha256_10(bh: & mut Bencher) {
400+
pub fn hmac_sha256_10(bh: &mut Bencher) {
401401
let mut engine = Hmac::<sha256::Hash>::engine();
402402
let bytes = [1u8; 10];
403403
bh.iter( || {
@@ -407,7 +407,7 @@ mod benches {
407407
}
408408

409409
#[bench]
410-
pub fn hmac_sha256_1k(bh: & mut Bencher) {
410+
pub fn hmac_sha256_1k(bh: &mut Bencher) {
411411
let mut engine = Hmac::<sha256::Hash>::engine();
412412
let bytes = [1u8; 1024];
413413
bh.iter( || {
@@ -417,7 +417,7 @@ mod benches {
417417
}
418418

419419
#[bench]
420-
pub fn hmac_sha256_64k(bh: & mut Bencher) {
420+
pub fn hmac_sha256_64k(bh: &mut Bencher) {
421421
let mut engine = Hmac::<sha256::Hash>::engine();
422422
let bytes = [1u8; 65536];
423423
bh.iter( || {

0 commit comments

Comments
 (0)