diff --git a/src/de.rs b/src/de.rs index 229a355f..73dcf0e4 100644 --- a/src/de.rs +++ b/src/de.rs @@ -1,10 +1,10 @@ +use crate::{ + sealed::binary_heap::Kind as BinaryHeapKind, BinaryHeap, IndexMap, IndexSet, LinearMap, String, + Vec, +}; use core::{fmt, marker::PhantomData}; use hash32::{BuildHasherDefault, Hash, Hasher}; use serde::de::{self, Deserialize, Deserializer, Error, MapAccess, SeqAccess}; -use crate::{ - sealed::binary_heap::Kind as BinaryHeapKind, - BinaryHeap, IndexMap, IndexSet, LinearMap, String, Vec, -}; // Sequential containers @@ -142,9 +142,9 @@ where where D: Deserializer<'de>, { - struct ValueVisitor<'de, K, V, S, const N:usize>(PhantomData<(&'de (), K, V, S)>); + struct ValueVisitor<'de, K, V, S, const N: usize>(PhantomData<(&'de (), K, V, S)>); - impl<'de, K, V, S, const N:usize> de::Visitor<'de> for ValueVisitor<'de, K, V, S, N> + impl<'de, K, V, S, const N: usize> de::Visitor<'de> for ValueVisitor<'de, K, V, S, N> where K: Eq + Hash + Deserialize<'de>, V: Deserialize<'de>, @@ -175,7 +175,7 @@ where } } -impl<'de, K, V, const N:usize> Deserialize<'de> for LinearMap +impl<'de, K, V, const N: usize> Deserialize<'de> for LinearMap where K: Eq + Deserialize<'de>, V: Deserialize<'de>, @@ -184,9 +184,9 @@ where where D: Deserializer<'de>, { - struct ValueVisitor<'de, K, V, const N:usize>(PhantomData<(&'de (), K, V)>); + struct ValueVisitor<'de, K, V, const N: usize>(PhantomData<(&'de (), K, V)>); - impl<'de, K, V, const N:usize> de::Visitor<'de> for ValueVisitor<'de, K, V, N> + impl<'de, K, V, const N: usize> de::Visitor<'de> for ValueVisitor<'de, K, V, N> where K: Eq + Deserialize<'de>, V: Deserialize<'de>, @@ -218,24 +218,18 @@ where // String containers -impl<'de, const N:usize> Deserialize<'de> for String -{ +impl<'de, const N: usize> Deserialize<'de> for String { fn deserialize(deserializer: D) -> Result where D: Deserializer<'de>, { - struct ValueVisitor<'de, const N:usize>(PhantomData<&'de ()>); + struct ValueVisitor<'de, const N: usize>(PhantomData<&'de ()>); - impl<'de, const N:usize > de::Visitor<'de> for ValueVisitor<'de, N> - { + impl<'de, const N: usize> de::Visitor<'de> for ValueVisitor<'de, N> { type Value = String; fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { - write!( - formatter, - "a string no more than {} bytes long", - N as u64 - ) + write!(formatter, "a string no more than {} bytes long", N as u64) } fn visit_str(self, v: &str) -> Result diff --git a/src/indexmap.rs b/src/indexmap.rs index c2e5d459..6636dede 100644 --- a/src/indexmap.rs +++ b/src/indexmap.rs @@ -126,14 +126,12 @@ macro_rules! probe_loop { } } -struct CoreMap -{ +struct CoreMap { entries: Vec, N>, indices: [Option; N], } -impl CoreMap -{ +impl CoreMap { const fn new() -> Self { const INIT: Option = None; diff --git a/src/ufmt.rs b/src/ufmt.rs index 84d87a4d..30da99ac 100644 --- a/src/ufmt.rs +++ b/src/ufmt.rs @@ -1,5 +1,5 @@ -use ufmt_write::uWrite; use crate::{string::String, vec::Vec}; +use ufmt_write::uWrite; impl uWrite for String { type Error = (); diff --git a/tests/cpass.rs b/tests/cpass.rs index 24b138e5..18d88d19 100644 --- a/tests/cpass.rs +++ b/tests/cpass.rs @@ -1,7 +1,7 @@ //! Collections of `Send`-able things are `Send` use heapless::{ - spsc::{Consumer, Producer, Queue, MultiCore}, + spsc::{Consumer, MultiCore, Producer, Queue}, HistoryBuffer, Vec, }; diff --git a/tests/tsan.rs b/tests/tsan.rs index 6e9f264b..7da1de7b 100644 --- a/tests/tsan.rs +++ b/tests/tsan.rs @@ -188,7 +188,7 @@ fn unchecked() { scope.execute(move || { let mut sum: usize = 0; - for _ in 0..N/ 2 { + for _ in 0..N / 2 { sum = sum.wrapping_add(usize::from(unsafe { c.dequeue_unchecked() })); } @@ -197,7 +197,7 @@ fn unchecked() { }); } - assert_eq!(rb.len(), N/ 2); + assert_eq!(rb.len(), N / 2); } #[test]