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

Commit 2890e9e

Browse files
committed
Refactor where statements
Be uniform, and elect to use default `rustfmt` layout for where statements.
1 parent 971f4b0 commit 2890e9e

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
lines changed

src/hex.rs

Lines changed: 8 additions & 12 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 {
@@ -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/sha256.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,8 @@ impl Midstate {
204204

205205
impl hex::FromHex for Midstate {
206206
fn from_byte_iter<I>(iter: I) -> Result<Self, hex::Error>
207-
where I: Iterator<Item=Result<u8, hex::Error>> +
208-
ExactSizeIterator +
209-
DoubleEndedIterator,
207+
where
208+
I: Iterator<Item = Result<u8, hex::Error>> + ExactSizeIterator + DoubleEndedIterator,
210209
{
211210
// DISPLAY_BACKWARD is true
212211
Ok(Midstate::from_inner(hex::FromHex::from_byte_iter(iter.rev())?))

src/sha256t.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ impl<'de, T: Tag> ::serde::de::Visitor<'de> for HexVisitor<T> {
175175
}
176176

177177
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
178-
where
179-
E: ::serde::de::Error,
178+
where
179+
E: ::serde::de::Error,
180180
{
181181
use core::str::FromStr;
182182
if let Ok(hex) = str::from_utf8(v) {
@@ -187,8 +187,8 @@ impl<'de, T: Tag> ::serde::de::Visitor<'de> for HexVisitor<T> {
187187
}
188188

189189
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
190-
where
191-
E: ::serde::de::Error,
190+
where
191+
E: ::serde::de::Error,
192192
{
193193
use core::str::FromStr;
194194
Hash::<T>::from_str(v).map_err(E::custom)
@@ -212,8 +212,8 @@ impl<'de, T: Tag> ::serde::de::Visitor<'de> for BytesVisitor<T> {
212212
}
213213

214214
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
215-
where
216-
E: ::serde::de::Error,
215+
where
216+
E: ::serde::de::Error,
217217
{
218218
Hash::<T>::from_slice(v).map_err(|_| {
219219
// from_slice only errors on incorrect length

0 commit comments

Comments
 (0)