Format with rustfmt 2019-06-09

This commit is contained in:
David Tolnay
2019-07-16 07:32:13 -07:00
parent a280942f02
commit 102a332616
4 changed files with 51 additions and 95 deletions
+21 -20
View File
@@ -790,7 +790,8 @@ seq_impl!(
BinaryHeap::clear,
BinaryHeap::with_capacity(size_hint::cautious(seq.size_hint())),
BinaryHeap::reserve,
BinaryHeap::push);
BinaryHeap::push
);
#[cfg(any(feature = "std", feature = "alloc"))]
seq_impl!(
@@ -799,7 +800,8 @@ seq_impl!(
BTreeSet::clear,
BTreeSet::new(),
nop_reserve,
BTreeSet::insert);
BTreeSet::insert
);
#[cfg(any(feature = "std", feature = "alloc"))]
seq_impl!(
@@ -2544,55 +2546,54 @@ where
}
}
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
use std::sync::atomic;
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
macro_rules! atomic_impl {
($ty:path, $primitive:ident) => {
impl<'de> Deserialize<'de> for $ty
{
impl<'de> Deserialize<'de> for $ty {
#[inline]
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where D: Deserializer<'de>
where
D: Deserializer<'de>,
{
let val = $primitive::deserialize(deserializer)?;
Ok(Self::new(val))
}
}
}
};
}
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicBool, bool);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI8, i8);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI16, i16);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI32, i32);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI64, i64);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicIsize, isize);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU8, u8);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU16, u16);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU32, u32);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU64, u64);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicUsize, usize);
+14 -13
View File
@@ -841,10 +841,11 @@ where
}
////////////////////////////////////////////////////////////////////////////////
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
use std::sync::atomic;
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
macro_rules! atomic_impl {
($ty:path, $method:ident $($cast:tt)*) => {
impl Serialize for $ty {
@@ -859,35 +860,35 @@ macro_rules! atomic_impl {
}
}
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicBool, serialize_bool);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI8, serialize_i8);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI16, serialize_i16);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI32, serialize_i32);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicI64, serialize_i64);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicIsize, serialize_i64 as i64);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU8, serialize_u8);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU16, serialize_u16);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU32, serialize_u32);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicU64, serialize_u64);
#[cfg(all(feature="std", std_integer_atomics))]
#[cfg(all(feature = "std", std_integer_atomics))]
atomic_impl!(atomic::AtomicUsize, serialize_u64 as u64);