From fbf7f4187546c8ace3d75acacdeca7a16e233444 Mon Sep 17 00:00:00 2001 From: Fmt Bot Date: Sun, 25 Aug 2024 01:14:09 +0000 Subject: [PATCH] 2024-08-25 automated rustfmt nightly --- bitcoin/src/blockdata/witness.rs | 2 +- bitcoin/src/network/mod.rs | 8 ++------ bitcoin/src/taproot/mod.rs | 2 +- hashes/src/internal_macros.rs | 2 +- internals/build.rs | 20 ++++++++++++++++---- io/src/bridge.rs | 1 + io/src/lib.rs | 28 +++++++--------------------- 7 files changed, 29 insertions(+), 34 deletions(-) diff --git a/bitcoin/src/blockdata/witness.rs b/bitcoin/src/blockdata/witness.rs index 105138884..6d11c4c6c 100644 --- a/bitcoin/src/blockdata/witness.rs +++ b/bitcoin/src/blockdata/witness.rs @@ -12,7 +12,7 @@ use io::{BufRead, Write}; use crate::consensus::encode::{Error, MAX_VEC_SIZE}; use crate::consensus::{Decodable, Encodable, WriteExt}; use crate::crypto::ecdsa; -use crate::prelude::{Vec, String}; +use crate::prelude::{String, Vec}; #[cfg(doc)] use crate::script::ScriptExt as _; use crate::taproot::{self, TAPROOT_ANNEX_PREFIX}; diff --git a/bitcoin/src/network/mod.rs b/bitcoin/src/network/mod.rs index d0e4ea348..26c517ab3 100644 --- a/bitcoin/src/network/mod.rs +++ b/bitcoin/src/network/mod.rs @@ -386,12 +386,8 @@ mod tests { #[cfg(feature = "serde")] fn serde_roundtrip() { use Network::*; - let tests = [ - (Bitcoin, "bitcoin"), - (Testnet, "testnet"), - (Signet, "signet"), - (Regtest, "regtest"), - ]; + let tests = + [(Bitcoin, "bitcoin"), (Testnet, "testnet"), (Signet, "signet"), (Regtest, "regtest")]; for tc in tests { let network = tc.0; diff --git a/bitcoin/src/taproot/mod.rs b/bitcoin/src/taproot/mod.rs index b85837a84..3388ce047 100644 --- a/bitcoin/src/taproot/mod.rs +++ b/bitcoin/src/taproot/mod.rs @@ -11,7 +11,7 @@ use core::cmp::Reverse; use core::fmt; use core::iter::FusedIterator; -use hashes::{hash_newtype, sha256t_tag, sha256t, HashEngine}; +use hashes::{hash_newtype, sha256t, sha256t_tag, HashEngine}; use internals::write_err; use io::Write; use secp256k1::{Scalar, Secp256k1}; diff --git a/hashes/src/internal_macros.rs b/hashes/src/internal_macros.rs index 7eda9dc00..a105a66c3 100644 --- a/hashes/src/internal_macros.rs +++ b/hashes/src/internal_macros.rs @@ -166,7 +166,7 @@ macro_rules! hash_type { ::hash_reader(reader) } } - } + }; } pub(crate) use hash_type; diff --git a/internals/build.rs b/internals/build.rs index 8b1007c28..7ac6c70fd 100644 --- a/internals/build.rs +++ b/internals/build.rs @@ -36,7 +36,8 @@ fn main() { let out_dir = std::env::var_os("OUT_DIR").expect("missing OUT_DIR env var"); let out_dir = std::path::PathBuf::from(out_dir); - let macro_file = std::fs::File::create(out_dir.join("rust_version.rs")).expect("failed to create rust_version.rs"); + let macro_file = std::fs::File::create(out_dir.join("rust_version.rs")) + .expect("failed to create rust_version.rs"); let macro_file = io::BufWriter::new(macro_file); write_macro(macro_file, msrv_minor, minor).expect("failed to write to rust_version.rs"); } @@ -63,17 +64,28 @@ fn write_macro(mut macro_file: impl io::Write, msrv_minor: u64, minor: u64) -> i // These two loops are the magic; we output the clause if_yes/if_no // dependent on the current compiler version (`minor`). for version in msrv_minor..=minor { - writeln!(macro_file, " (if >= 1.{} {{ $($if_yes:tt)* }} $(else {{ $($if_no:tt)* }})?) => {{", version)?; + writeln!( + macro_file, + " (if >= 1.{} {{ $($if_yes:tt)* }} $(else {{ $($if_no:tt)* }})?) => {{", + version + )?; writeln!(macro_file, " $($if_yes)*")?; writeln!(macro_file, " }};")?; } for version in (minor + 1)..(MAX_USED_VERSION + 1) { - writeln!(macro_file, " (if >= 1.{} {{ $($if_yes:tt)* }} $(else {{ $($if_no:tt)* }})?) => {{", version)?; + writeln!( + macro_file, + " (if >= 1.{} {{ $($if_yes:tt)* }} $(else {{ $($if_no:tt)* }})?) => {{", + version + )?; writeln!(macro_file, " $($($if_no)*)?")?; writeln!(macro_file, " }};")?; } writeln!(macro_file, " (if >= $unknown:tt $($rest:tt)*) => {{")?; - writeln!(macro_file, " compile_error!(concat!(\"unknown Rust version \", stringify!($unknown)));")?; + writeln!( + macro_file, + " compile_error!(concat!(\"unknown Rust version \", stringify!($unknown)));" + )?; writeln!(macro_file, " }};")?; writeln!(macro_file, "}}")?; writeln!(macro_file, "pub use rust_version;")?; diff --git a/io/src/bridge.rs b/io/src/bridge.rs index 7c7d62f1f..204a77a51 100644 --- a/io/src/bridge.rs +++ b/io/src/bridge.rs @@ -1,5 +1,6 @@ #[cfg(feature = "alloc")] use alloc::boxed::Box; + use internals::rust_version; /// A bridging wrapper providing the IO traits for types that already implement `std` IO traits. diff --git a/io/src/lib.rs b/io/src/lib.rs index c7cacadf1..e3b7ac0cb 100644 --- a/io/src/lib.rs +++ b/io/src/lib.rs @@ -155,26 +155,18 @@ impl<'a, R: BufRead + ?Sized> BufRead for Take<'a, R> { impl Read for &'_ mut T { #[inline] - fn read(&mut self, buf: &mut [u8]) -> Result { - (**self).read(buf) - } + fn read(&mut self, buf: &mut [u8]) -> Result { (**self).read(buf) } #[inline] - fn read_exact(&mut self, buf: &mut [u8]) -> Result<()> { - (**self).read_exact(buf) - } + fn read_exact(&mut self, buf: &mut [u8]) -> Result<()> { (**self).read_exact(buf) } } impl BufRead for &'_ mut T { #[inline] - fn fill_buf(&mut self) -> Result<&[u8]> { - (**self).fill_buf() - } + fn fill_buf(&mut self) -> Result<&[u8]> { (**self).fill_buf() } #[inline] - fn consume(&mut self, amount: usize) { - (**self).consume(amount) - } + fn consume(&mut self, amount: usize) { (**self).consume(amount) } } impl Read for &[u8] { @@ -285,19 +277,13 @@ pub trait Write { impl Write for &'_ mut T { #[inline] - fn write(&mut self, buf: &[u8]) -> Result { - (**self).write(buf) - } + fn write(&mut self, buf: &[u8]) -> Result { (**self).write(buf) } #[inline] - fn write_all(&mut self, buf: &[u8]) -> Result<()> { - (**self).write_all(buf) - } + fn write_all(&mut self, buf: &[u8]) -> Result<()> { (**self).write_all(buf) } #[inline] - fn flush(&mut self) -> Result<()> { - (**self).flush() - } + fn flush(&mut self) -> Result<()> { (**self).flush() } } #[cfg(feature = "alloc")]