Run the formatter

Currently we are not running the formatter in CI, in preparation for
doing so run `cargo +nightly fmt` to clear all current formatting
issues.

No manual changes.
This commit is contained in:
Tobin C. Harding 2022-11-22 08:53:23 +11:00
parent d5065cc771
commit c7807dff9c
6 changed files with 17 additions and 24 deletions

View File

@ -288,7 +288,7 @@ mod tests {
} }
#[cfg(bench)] #[cfg(bench)]
#[cfg(feature = "rand-std")] // Currently only a single bench that requires "rand-std". #[cfg(feature = "rand-std")] // Currently only a single bench that requires "rand-std".
mod benches { mod benches {
use test::{black_box, Bencher}; use test::{black_box, Bencher};

View File

@ -432,7 +432,7 @@ mod tests {
} }
#[cfg(bench)] #[cfg(bench)]
#[cfg(feature = "rand-std")] // Currently only a single bench that requires "rand-std". #[cfg(feature = "rand-std")] // Currently only a single bench that requires "rand-std".
mod benches { mod benches {
use test::{black_box, Bencher}; use test::{black_box, Bencher};

View File

@ -951,7 +951,7 @@ impl<'a> From<&'a KeyPair> for PublicKey {
impl str::FromStr for KeyPair { impl str::FromStr for KeyPair {
type Err = Error; type Err = Error;
#[allow(unused_variables, unreachable_code)] // When built with no default features. #[allow(unused_variables, unreachable_code)] // When built with no default features.
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
#[cfg(feature = "global-context")] #[cfg(feature = "global-context")]
let ctx = SECP256K1; let ctx = SECP256K1;
@ -1515,7 +1515,7 @@ mod test {
use core::str::FromStr; use core::str::FromStr;
#[cfg(feature = "rand")] #[cfg(feature = "rand")]
use rand::{self, RngCore, rngs::mock::StepRng}; use rand::{self, rngs::mock::StepRng, RngCore};
use serde_test::{Configure, Token}; use serde_test::{Configure, Token};
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
use wasm_bindgen_test::wasm_bindgen_test as test; use wasm_bindgen_test::wasm_bindgen_test as test;

View File

@ -530,19 +530,16 @@ pub(crate) fn random_32_bytes<R: rand::Rng + ?Sized>(rng: &mut R) -> [u8; 32] {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
#[allow(unused_imports)] // When building with no default features.
use super::*;
use std::str::FromStr; use std::str::FromStr;
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
use wasm_bindgen_test::wasm_bindgen_test as test; use wasm_bindgen_test::wasm_bindgen_test as test;
#[allow(unused_imports)] // When building with no default features.
use super::*;
use crate::{constants, ecdsa, from_hex, Error, Message};
#[cfg(feature = "alloc")] #[cfg(feature = "alloc")]
use crate::{ffi, PublicKey, Secp256k1, SecretKey}; use crate::{ffi, PublicKey, Secp256k1, SecretKey};
use crate::{
constants, ecdsa, from_hex, Error, Message,
};
macro_rules! hex { macro_rules! hex {
($hex:expr) => {{ ($hex:expr) => {{
@ -889,9 +886,10 @@ mod tests {
#[test] #[test]
#[cfg(feature = "rand-std")] #[cfg(feature = "rand-std")]
fn test_hex() { fn test_hex() {
use super::to_hex;
use rand::RngCore; use rand::RngCore;
use super::to_hex;
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
const AMOUNT: usize = 1024; const AMOUNT: usize = 1024;
for i in 0..AMOUNT { for i in 0..AMOUNT {

View File

@ -17,22 +17,17 @@
#[macro_export] #[macro_export]
macro_rules! impl_array_newtype { macro_rules! impl_array_newtype {
($thing:ident, $ty:ty, $len:expr) => { ($thing:ident, $ty:ty, $len:expr) => {
// We cannot derive these traits because Rust 1.41.1 requires `std::array::LengthAtMost32`. // We cannot derive these traits because Rust 1.41.1 requires `std::array::LengthAtMost32`.
impl PartialEq for $thing { impl PartialEq for $thing {
#[inline] #[inline]
fn eq(&self, other: &$thing) -> bool { fn eq(&self, other: &$thing) -> bool { &self[..] == &other[..] }
&self[..] == &other[..]
}
} }
impl Eq for $thing {} impl Eq for $thing {}
impl core::hash::Hash for $thing { impl core::hash::Hash for $thing {
fn hash<H: core::hash::Hasher>(&self, state: &mut H) { fn hash<H: core::hash::Hasher>(&self, state: &mut H) { (&self[..]).hash(state) }
(&self[..]).hash(state)
}
} }
impl PartialOrd for $thing { impl PartialOrd for $thing {
@ -44,9 +39,7 @@ macro_rules! impl_array_newtype {
impl Ord for $thing { impl Ord for $thing {
#[inline] #[inline]
fn cmp(&self, other: &$thing) -> core::cmp::Ordering { fn cmp(&self, other: &$thing) -> core::cmp::Ordering { self[..].cmp(&other[..]) }
self[..].cmp(&other[..])
}
} }
impl AsRef<[$ty; $len]> for $thing { impl AsRef<[$ty; $len]> for $thing {
@ -81,7 +74,7 @@ macro_rules! impl_array_newtype {
dat.as_mut_ptr() dat.as_mut_ptr()
} }
} }
} };
} }
macro_rules! impl_pretty_debug { macro_rules! impl_pretty_debug {
@ -139,5 +132,5 @@ macro_rules! impl_fast_comparisons {
self.0.eq_fast_unstable(&other.0) self.0.eq_fast_unstable(&other.0)
} }
} }
} };
} }

View File

@ -11,7 +11,9 @@ use crate::ffi::{self, CPtr};
use crate::key::{KeyPair, XOnlyPublicKey}; use crate::key::{KeyPair, XOnlyPublicKey};
#[cfg(feature = "global-context")] #[cfg(feature = "global-context")]
use crate::SECP256K1; use crate::SECP256K1;
use crate::{constants, from_hex, impl_array_newtype, Error, Message, Secp256k1, Signing, Verification}; use crate::{
constants, from_hex, impl_array_newtype, Error, Message, Secp256k1, Signing, Verification,
};
/// Represents a Schnorr signature. /// Represents a Schnorr signature.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]