Release 1.0.96

conservatively limit atomic features

.travis.yml

@@ -26,10 +26,8 @@ matrix:
         - cargo build --no-default-features --features alloc
         - cargo build --no-default-features --features rc,alloc
         - cargo test --features derive,rc,unstable
-        - cd "${TRAVIS_BUILD_DIR}/test_suite/deps"
-        - cargo build
         - cd "${TRAVIS_BUILD_DIR}/test_suite"
-        - cargo test --features compiletest,unstable
+        - cargo test --features unstable
         - cd "${TRAVIS_BUILD_DIR}/test_suite/no_std"
         - cargo build
 
@@ -50,6 +48,12 @@ matrix:
     - rust: 1.21.0
     - rust: 1.25.0
     - rust: 1.26.0
+    - rust: 1.34.0
+
+    - rust: 1.36.0
+      script:
+        - cd "${TRAVIS_BUILD_DIR}/serde"
+        - cargo build --no-default-features --features alloc
 
     - rust: nightly
       name: Clippy

README.md

@@ -81,19 +81,19 @@ good response, we are happy to respond to [GitHub issues][issues] as well.
 [irc]: https://wiki.mozilla.org/IRC
 [issues]: https://github.com/serde-rs/serde/issues/new/choose
 
-## License
+<br>
 
-Serde is licensed under either of
+#### License
 
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+<sup>
-   http://www.apache.org/licenses/LICENSE-2.0)
+Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
-   http://opensource.org/licenses/MIT)
+</sup>
 
-at your option.
+<br>
-
-### Contribution
 
+<sub>
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.
+</sub>

appveyor.yml

@@ -35,7 +35,5 @@ for:
       - cargo build --no-default-features --features alloc
       - cargo build --no-default-features --features rc,alloc
       - cargo test --features derive,rc,unstable
-      - cd %APPVEYOR_BUILD_FOLDER%\test_suite\deps
-      - cargo build
       - cd %APPVEYOR_BUILD_FOLDER%\test_suite
-      - cargo test --features compiletest,unstable
+      - cargo test --features unstable

serde/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "serde"
-version = "1.0.90" # remember to update html_root_url
+version = "1.0.96" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "A generic serialization/deserialization framework"
 homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
@@ -48,11 +48,7 @@ unstable = []
 # Provide impls for types in the Rust core allocation and collections library
 # including String, Box<T>, Vec<T>, and Cow<T>. This is a subset of std but may
 # be enabled without depending on all of std.
-#
+alloc = []
-# Requires a dependency on the unstable core allocation library:
-#
-#    https://doc.rust-lang.org/alloc/
-alloc = ["unstable"]
 
 # Opt into impls for Rc<T> and Arc<T>. Serializing and deserializing these types
 # does not preserve identity and may result in multiple copies of the same data.

serde/build.rs

@@ -68,6 +68,25 @@ fn main() {
     if minor >= 28 {
         println!("cargo:rustc-cfg=num_nonzero");
     }
+
+    if minor >= 34 {
+        // Whitelist of archs that support std::sync::atomic module. Ideally we
+        // would use #[cfg(target_has_atomic = "...")] but it is not stable yet.
+        // Instead this is based on rustc's src/librustc_target/spec/*.rs.
+        let has_atomic64 = target.starts_with("x86_64")
+            || target.starts_with("i686")
+            || target.starts_with("aarch64")
+            || target.starts_with("powerpc64")
+            || target.starts_with("sparc64")
+            || target.starts_with("mips64el");
+        let has_atomic32 = has_atomic64 || emscripten;
+        if has_atomic64 {
+            println!("cargo:rustc-cfg=std_atomic64");
+        }
+        if has_atomic32 {
+            println!("cargo:rustc-cfg=std_atomic");
+        }
+    }
 }
 
 fn rustc_minor_version() -> Option<u32> {

serde/src/de/ignored_any.rs

@@ -1,6 +1,8 @@
 use lib::*;
 
-use de::{Deserialize, Deserializer, Error, MapAccess, SeqAccess, Visitor};
+use de::{
+    Deserialize, Deserializer, EnumAccess, Error, MapAccess, SeqAccess, VariantAccess, Visitor,
+};
 
 /// An efficient way of discarding data from a deserializer.
 ///
@@ -205,6 +207,13 @@ impl<'de> Visitor<'de> for IgnoredAny {
         let _ = bytes;
         Ok(IgnoredAny)
     }
+
+    fn visit_enum<A>(self, data: A) -> Result<Self::Value, A::Error>
+    where
+        A: EnumAccess<'de>,
+    {
+        data.variant::<IgnoredAny>()?.1.newtype_variant()
+    }
 }
 
 impl<'de> Deserialize<'de> for IgnoredAny {

serde/src/de/impls.rs

@@ -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!(
@@ -965,7 +967,7 @@ impl<'de, T> Deserialize<'de> for [T; 0] {
 }
 
 macro_rules! array_impls {
-    ($($len:expr => ($($n:tt $name:ident)+))+) => {
+    ($($len:expr => ($($n:tt)+))+) => {
         $(
             impl<'de, T> Visitor<'de> for ArrayVisitor<[T; $len]>
             where
@@ -982,14 +984,12 @@ macro_rules! array_impls {
                 where
                     A: SeqAccess<'de>,
                 {
-                    $(
+                    Ok([$(
-                        let $name = match try!(seq.next_element()) {
+                        match try!(seq.next_element()) {
                             Some(val) => val,
                             None => return Err(Error::invalid_length($n, &self)),
-                        };
+                        }
-                    )+
+                    ),+])
-
-                    Ok([$($name),+])
                 }
             }
 
@@ -1045,38 +1045,38 @@ macro_rules! array_impls {
 }
 
 array_impls! {
-    1 => (0 a)
+    1 => (0)
-    2 => (0 a 1 b)
+    2 => (0 1)
-    3 => (0 a 1 b 2 c)
+    3 => (0 1 2)
-    4 => (0 a 1 b 2 c 3 d)
+    4 => (0 1 2 3)
-    5 => (0 a 1 b 2 c 3 d 4 e)
+    5 => (0 1 2 3 4)
-    6 => (0 a 1 b 2 c 3 d 4 e 5 f)
+    6 => (0 1 2 3 4 5)
-    7 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g)
+    7 => (0 1 2 3 4 5 6)
-    8 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h)
+    8 => (0 1 2 3 4 5 6 7)
-    9 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i)
+    9 => (0 1 2 3 4 5 6 7 8)
-    10 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j)
+    10 => (0 1 2 3 4 5 6 7 8 9)
-    11 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k)
+    11 => (0 1 2 3 4 5 6 7 8 9 10)
-    12 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l)
+    12 => (0 1 2 3 4 5 6 7 8 9 10 11)
-    13 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m)
+    13 => (0 1 2 3 4 5 6 7 8 9 10 11 12)
-    14 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n)
+    14 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13)
-    15 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o)
+    15 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14)
-    16 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p)
+    16 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)
-    17 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q)
+    17 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16)
-    18 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r)
+    18 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)
-    19 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s)
+    19 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18)
-    20 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t)
+    20 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19)
-    21 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u)
+    21 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20)
-    22 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v)
+    22 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21)
-    23 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w)
+    23 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22)
-    24 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x)
+    24 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23)
-    25 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y)
+    25 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24)
-    26 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y 25 z)
+    26 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25)
-    27 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y 25 z 26 aa)
+    27 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26)
-    28 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y 25 z 26 aa 27 ab)
+    28 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27)
-    29 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y 25 z 26 aa 27 ab 28 ac)
+    29 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28)
-    30 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y 25 z 26 aa 27 ab 28 ac 29 ad)
+    30 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29)
-    31 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y 25 z 26 aa 27 ab 28 ac 29 ad 30 ae)
+    31 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30)
-    32 => (0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p 16 q 17 r 18 s 19 t 20 u 21 v 22 w 23 x 24 y 25 z 26 aa 27 ab 28 ac 29 ad 30 ae 31 af)
+    32 => (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -2545,3 +2545,31 @@ where
         Deserialize::deserialize(deserializer).map(Wrapping)
     }
 }
+
+#[cfg(all(feature = "std", std_atomic))]
+macro_rules! atomic_impl {
+    ($($ty:ident)*) => {
+        $(
+            impl<'de> Deserialize<'de> for $ty {
+                fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+                where
+                    D: Deserializer<'de>,
+                {
+                    Deserialize::deserialize(deserializer).map(Self::new)
+                }
+            }
+        )*
+    };
+}
+
+#[cfg(all(feature = "std", std_atomic))]
+atomic_impl! {
+    AtomicBool
+    AtomicI8 AtomicI16 AtomicI32 AtomicIsize
+    AtomicU8 AtomicU16 AtomicU32 AtomicUsize
+}
+
+#[cfg(all(feature = "std", std_atomic64))]
+atomic_impl! {
+    AtomicI64 AtomicU64
+}

serde/src/de/value.rs

@@ -1287,10 +1287,40 @@ where
         visitor.visit_map(self.map)
     }
 
+    fn deserialize_enum<V>(
+        self,
+        _name: &str,
+        _variants: &'static [&'static str],
+        visitor: V,
+    ) -> Result<V::Value, Self::Error>
+    where
+        V: de::Visitor<'de>,
+    {
+        visitor.visit_enum(self)
+    }
+
     forward_to_deserialize_any! {
         bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
         bytes byte_buf option unit unit_struct newtype_struct seq tuple
-        tuple_struct map struct enum identifier ignored_any
+        tuple_struct map struct identifier ignored_any
+    }
+}
+
+impl<'de, A> de::EnumAccess<'de> for MapAccessDeserializer<A>
+where
+    A: de::MapAccess<'de>,
+{
+    type Error = A::Error;
+    type Variant = private::MapAsEnum<A>;
+
+    fn variant_seed<T>(mut self, seed: T) -> Result<(T::Value, Self::Variant), Self::Error>
+    where
+        T: de::DeserializeSeed<'de>,
+    {
+        match self.map.next_key_seed(seed)? {
+            Some(key) => Ok((key, private::map_as_enum(self.map))),
+            None => Err(de::Error::invalid_type(de::Unexpected::Map, &"enum")),
+        }
     }
 }
 
@@ -1299,7 +1329,7 @@ where
 mod private {
     use lib::*;
 
-    use de::{self, Unexpected};
+    use de::{self, DeserializeSeed, Deserializer, MapAccess, Unexpected, VariantAccess, Visitor};
 
     #[derive(Clone, Debug)]
     pub struct UnitOnly<E> {
@@ -1360,6 +1390,92 @@ mod private {
         }
     }
 
+    #[derive(Clone, Debug)]
+    pub struct MapAsEnum<A> {
+        map: A,
+    }
+
+    pub fn map_as_enum<A>(map: A) -> MapAsEnum<A> {
+        MapAsEnum { map: map }
+    }
+
+    impl<'de, A> VariantAccess<'de> for MapAsEnum<A>
+    where
+        A: MapAccess<'de>,
+    {
+        type Error = A::Error;
+
+        fn unit_variant(mut self) -> Result<(), Self::Error> {
+            self.map.next_value()
+        }
+
+        fn newtype_variant_seed<T>(mut self, seed: T) -> Result<T::Value, Self::Error>
+        where
+            T: DeserializeSeed<'de>,
+        {
+            self.map.next_value_seed(seed)
+        }
+
+        fn tuple_variant<V>(mut self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
+        where
+            V: Visitor<'de>,
+        {
+            self.map.next_value_seed(SeedTupleVariant {
+                len: len,
+                visitor: visitor,
+            })
+        }
+
+        fn struct_variant<V>(
+            mut self,
+            _fields: &'static [&'static str],
+            visitor: V,
+        ) -> Result<V::Value, Self::Error>
+        where
+            V: Visitor<'de>,
+        {
+            self.map
+                .next_value_seed(SeedStructVariant { visitor: visitor })
+        }
+    }
+
+    struct SeedTupleVariant<V> {
+        len: usize,
+        visitor: V,
+    }
+
+    impl<'de, V> DeserializeSeed<'de> for SeedTupleVariant<V>
+    where
+        V: Visitor<'de>,
+    {
+        type Value = V::Value;
+
+        fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            deserializer.deserialize_tuple(self.len, self.visitor)
+        }
+    }
+
+    struct SeedStructVariant<V> {
+        visitor: V,
+    }
+
+    impl<'de, V> DeserializeSeed<'de> for SeedStructVariant<V>
+    where
+        V: Visitor<'de>,
+    {
+        type Value = V::Value;
+
+        fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            deserializer.deserialize_map(self.visitor)
+        }
+    }
+
     /// Avoid having to restate the generic types on `MapDeserializer`. The
     /// `Iterator::Item` contains enough information to figure out K and V.
     pub trait Pair {

serde/src/export.rs

@@ -9,7 +9,7 @@ pub use lib::result::Result::{self, Err, Ok};
 pub use self::string::from_utf8_lossy;
 
 #[cfg(any(feature = "alloc", feature = "std"))]
-pub use lib::Vec;
+pub use lib::{ToString, Vec};
 
 mod string {
     use lib::*;

serde/src/integer128.rs

@@ -1,13 +1,13 @@
 /// Conditional compilation depending on whether Serde is built with support for
 /// 128-bit integers.
 ///
-/// Data formats that wish to support Rust compiler versions older than 1.26 may
+/// Data formats that wish to support Rust compiler versions older than 1.26
-/// place the i128 / u128 methods of their Serializer and Deserializer behind
+/// (or targets that lack 128-bit integers) may place the i128 / u128 methods
-/// this macro.
+/// of their Serializer and Deserializer behind this macro.
 ///
-/// Data formats that require a minimum Rust compiler version of at least 1.26
+/// Data formats that require a minimum Rust compiler version of at least 1.26,
-/// do not need to bother with this macro and may assume support for 128-bit
+/// or do not target platforms that lack 128-bit integers, do not need to
-/// integers.
+/// bother with this macro and may assume support for 128-bit integers.
 ///
 /// ```edition2018
 /// # use serde::private::ser::Error;

serde/src/lib.rs

@@ -46,7 +46,6 @@
 //! - [BSON], the data storage and network transfer format used by MongoDB.
 //! - [Avro], a binary format used within Apache Hadoop, with support for schema
 //!   definition.
-//! - [Hjson], a variant of JSON designed to be readable and writable by humans.
 //! - [JSON5], A superset of JSON including some productions from ES5.
 //! - [URL], the x-www-form-urlencoded format.
 //! - [Envy], a way to deserialize environment variables into Rust structs.
@@ -64,7 +63,6 @@
 //! [RON]: https://github.com/ron-rs/ron
 //! [BSON]: https://github.com/zonyitoo/bson-rs
 //! [Avro]: https://github.com/flavray/avro-rs
-//! [Hjson]: https://github.com/laktak/hjson-rust
 //! [JSON5]: https://github.com/callum-oakley/json5-rs
 //! [URL]: https://github.com/nox/serde_urlencoded
 //! [Envy]: https://github.com/softprops/envy
@@ -75,7 +73,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.90")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.96")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
 // Unstable functionality only if the user asks for it. For tracking and
@@ -83,7 +81,7 @@
 //
 //    https://github.com/serde-rs/serde/issues/812
 #![cfg_attr(feature = "unstable", feature(specialization, never_type))]
-#![cfg_attr(feature = "alloc", feature(alloc))]
+#![allow(unknown_lints, bare_trait_objects)]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy and clippy_pedantic lints
@@ -91,13 +89,13 @@
     feature = "cargo-clippy",
     allow(
         // not available in our oldest supported compiler
-        const_static_lifetime,
+        checked_conversions,
         empty_enum,
         redundant_field_names,
+        redundant_static_lifetimes,
         // integer and float ser/de requires these sorts of casts
         cast_possible_truncation,
         cast_possible_wrap,
-        cast_precision_loss,
         cast_sign_loss,
         // things are often more readable this way
         cast_lossless,
@@ -155,7 +153,7 @@ mod lib {
     #[cfg(all(feature = "alloc", not(feature = "std")))]
     pub use alloc::string::{String, ToString};
     #[cfg(feature = "std")]
-    pub use std::string::String;
+    pub use std::string::{String, ToString};
 
     #[cfg(all(feature = "alloc", not(feature = "std")))]
     pub use alloc::vec::Vec;
@@ -214,6 +212,14 @@ mod lib {
     #[cfg(range_inclusive)]
     pub use self::core::ops::RangeInclusive;
 
+    #[cfg(all(feature = "std", std_atomic))]
+    pub use std::sync::atomic::{
+        AtomicBool, AtomicI16, AtomicI32, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, AtomicU8,
+        AtomicUsize, Ordering,
+    };
+    #[cfg(all(feature = "std", std_atomic64))]
+    pub use std::sync::atomic::{AtomicI64, AtomicU64};
+
     #[cfg(any(core_duration, feature = "std"))]
     pub use self::core::time::Duration;
 }

serde/src/private/de.rs

@@ -1420,6 +1420,7 @@ mod content {
                 Content::ByteBuf(v) => visitor.visit_byte_buf(v),
                 Content::Bytes(v) => visitor.visit_borrowed_bytes(v),
                 Content::U8(v) => visitor.visit_u8(v),
+                Content::U64(v) => visitor.visit_u64(v),
                 _ => Err(self.invalid_type(&visitor)),
             }
         }
@@ -2123,6 +2124,7 @@ mod content {
                 Content::ByteBuf(ref v) => visitor.visit_bytes(v),
                 Content::Bytes(v) => visitor.visit_borrowed_bytes(v),
                 Content::U8(v) => visitor.visit_u8(v),
+                Content::U64(v) => visitor.visit_u64(v),
                 _ => Err(self.invalid_type(&visitor)),
             }
         }

serde/src/ser/impls.rs

@@ -620,6 +620,7 @@ impl Serialize for SystemTime {
 #[cfg(feature = "std")]
 macro_rules! serialize_display_bounded_length {
     ($value:expr, $max:expr, $serializer:expr) => {{
+        #[allow(deprecated)]
         let mut buffer: [u8; $max] = unsafe { mem::uninitialized() };
         let remaining_len = {
             let mut remaining = &mut buffer[..];
@@ -838,3 +839,33 @@ where
         self.0.serialize(serializer)
     }
 }
+
+////////////////////////////////////////////////////////////////////////////////
+
+#[cfg(all(feature = "std", std_atomic))]
+macro_rules! atomic_impl {
+    ($($ty:ident)*) => {
+        $(
+            impl Serialize for $ty {
+                fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+                where
+                    S: Serializer,
+                {
+                    self.load(Ordering::SeqCst).serialize(serializer)
+                }
+            }
+        )*
+    }
+}
+
+#[cfg(all(feature = "std", std_atomic))]
+atomic_impl! {
+    AtomicBool
+    AtomicI8 AtomicI16 AtomicI32 AtomicIsize
+    AtomicU8 AtomicU16 AtomicU32 AtomicUsize
+}
+
+#[cfg(all(feature = "std", std_atomic64))]
+atomic_impl! {
+    AtomicI64 AtomicU64
+}

serde_derive/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "serde_derive"
-version = "1.0.90" # remember to update html_root_url
+version = "1.0.96" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
 homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"

serde_derive/src/de.rs

@@ -2059,7 +2059,7 @@ fn deserialize_identifier(
     ) = if collect_other_fields {
         (
             Some(quote! {
-                let __value = _serde::private::de::Content::String(__value.to_string());
+                let __value = _serde::private::de::Content::String(_serde::export::ToString::to_string(__value));
             }),
             Some(quote! {
                 let __value = _serde::private::de::Content::Str(__value);

serde_derive/src/internals/attr.rs

@@ -689,8 +689,7 @@ impl Container {
 
     pub fn serde_path(&self) -> Cow<syn::Path> {
         self.custom_serde_path()
-            .map(Cow::Borrowed)
+            .map_or_else(|| Cow::Owned(parse_quote!(_serde)), Cow::Borrowed)
-            .unwrap_or_else(|| Cow::Owned(parse_quote!(_serde)))
     }
 }
 

serde_derive/src/lib.rs

@@ -13,7 +13,8 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.90")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.96")]
+#![allow(unknown_lints, bare_trait_objects)]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints
@@ -34,6 +35,7 @@
     feature = "cargo-clippy",
     allow(
         cast_possible_truncation,
+        checked_conversions,
         doc_markdown,
         enum_glob_use,
         filter_map,

serde_derive_internals/Cargo.toml

@@ -2,7 +2,7 @@
 name = "serde_derive_internals"
 version = "0.24.1" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "AST representation used by Serde derive macros. Unstable."
 homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"

serde_derive_internals/lib.rs

@@ -1,4 +1,5 @@
 #![doc(html_root_url = "https://docs.rs/serde_derive_internals/0.24.1")]
+#![allow(unknown_lints, bare_trait_objects)]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(
     feature = "cargo-clippy",

serde_test/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "serde_test"
-version = "1.0.90" # remember to update html_root_url
+version = "1.0.96" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"
 homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"

serde_test/src/lib.rs

@@ -144,7 +144,7 @@
 //! # }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/serde_test/1.0.90")]
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.96")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints

test_suite/Cargo.toml

@@ -7,14 +7,15 @@ publish = false
 
 [features]
 unstable = ["serde/unstable"]
-compiletest = ["compiletest_rs"]
+
+[dependencies]
+serde = { path = "../serde" }
 
 [dev-dependencies]
 fnv = "1.0"
 rustc-serialize = "0.3.16"
+rustversion = "0.1"
 serde = { path = "../serde", features = ["rc", "derive"] }
 serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
 serde_test = { path = "../serde_test" }
-
+trybuild = "1.0"
-[dependencies]
-compiletest_rs = { version = "0.3", optional = true, features = ["stable"] }

test_suite/README.md

@@ -1,18 +0,0 @@
-#### To run unit tests
-
-```sh
-cargo test
-```
-
-#### To run ui tests
-
-```sh
-(cd deps && cargo clean && cargo update && cargo build)
-cargo test --features compiletest
-```
-
-#### To update goldens after running ui tests
-
-```sh
-tests/ui/update-references.sh
-```

test_suite/deps/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "serde_test_suite_deps"
-version = "0.0.0"
-authors = ["David Tolnay <dtolnay@gmail.com>"]
-publish = false
-
-[workspace]
-
-[dependencies]
-serde = { path = "../../serde" }
-serde_derive = { path = "../../serde_derive" }

test_suite/deps/src/lib.rs

@@ -1,3 +0,0 @@
-#![feature(/*=============================================]
-#![===  Serde test suite requires a nightly compiler.  ===]
-#![====================================================*/)]

test_suite/tests/compiletest.rs

@@ -1,21 +1,7 @@
-#![cfg(feature = "compiletest")]
+#[cfg(not(target_os = "emscripten"))]
-
+#[rustversion::attr(not(nightly), ignore)]
-use compiletest_rs as compiletest;
-
 #[test]
 fn ui() {
-    compiletest::run_tests(&compiletest::Config {
+    let t = trybuild::TestCases::new();
-        mode: compiletest::common::Mode::Ui,
+    t.compile_fail("tests/ui/**/*.rs");
-        src_base: std::path::PathBuf::from("tests/ui"),
-        target_rustcflags: Some(String::from(
-            "\
-             --edition=2018 \
-             -L deps/target/debug/deps \
-             -Z unstable-options \
-             --extern serde_derive \
-             ",
-        )),
-        build_base: std::path::PathBuf::from("../target/ui"),
-        ..Default::default()
-    });
 }

test_suite/tests/test_de.rs

@@ -1,18 +1,27 @@
-#![allow(clippy::decimal_literal_representation)]
+#![allow(clippy::decimal_literal_representation, clippy::unreadable_literal)]
 #![cfg_attr(feature = "unstable", feature(never_type))]
 
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::default::Default;
 use std::ffi::{CStr, CString, OsString};
+use std::fmt::Debug;
 use std::net;
 use std::num::Wrapping;
 use std::ops::Bound;
 use std::path::{Path, PathBuf};
 use std::rc::{Rc, Weak as RcWeak};
+use std::sync::atomic::{
+    AtomicBool, AtomicI16, AtomicI32, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, AtomicU8,
+    AtomicUsize, Ordering,
+};
 use std::sync::{Arc, Weak as ArcWeak};
 use std::time::{Duration, UNIX_EPOCH};
 
+#[cfg(target_arch = "x86_64")]
+use std::sync::atomic::{AtomicI64, AtomicU64};
+
 use fnv::FnvHasher;
+use serde::de::DeserializeOwned;
 use serde::{Deserialize, Deserializer};
 use serde_test::{assert_de_tokens, assert_de_tokens_error, Configure, Token};
 
@@ -124,6 +133,19 @@ enum EnumOther {
     Other,
 }
 
+#[derive(PartialEq, Debug)]
+struct IgnoredAny;
+
+impl<'de> Deserialize<'de> for IgnoredAny {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        serde::de::IgnoredAny::deserialize(deserializer)?;
+        Ok(IgnoredAny)
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 macro_rules! declare_tests {
@@ -929,6 +951,21 @@ declare_tests! {
             Token::SeqEnd,
         ],
     }
+    test_ignored_any {
+        IgnoredAny => &[
+            Token::Str("s"),
+        ],
+        IgnoredAny => &[
+            Token::Seq { len: Some(1) },
+            Token::Bool(true),
+            Token::SeqEnd,
+        ],
+        IgnoredAny => &[
+            Token::Enum { name: "E" },
+            Token::Str("Rust"),
+            Token::Unit,
+        ],
+    }
 }
 
 declare_tests! {
@@ -1112,6 +1149,45 @@ fn test_never_type() {
     );
 }
 
+#[test]
+fn test_atomics() {
+    fn test<L, A, T>(load: L, val: T, token: Token)
+    where
+        L: Fn(&A, Ordering) -> T,
+        A: DeserializeOwned,
+        T: PartialEq + Debug,
+    {
+        let tokens = &[token];
+        let mut de = serde_test::Deserializer::new(tokens);
+        match A::deserialize(&mut de) {
+            Ok(v) => {
+                let loaded = load(&v, Ordering::SeqCst);
+                assert_eq!(val, loaded);
+            }
+            Err(e) => panic!("tokens failed to deserialize: {}", e),
+        };
+        if de.remaining() > 0 {
+            panic!("{} remaining tokens", de.remaining());
+        }
+    }
+
+    test(AtomicBool::load, true, Token::Bool(true));
+    test(AtomicI8::load, -127, Token::I8(-127i8));
+    test(AtomicI16::load, -510, Token::I16(-510i16));
+    test(AtomicI32::load, -131072, Token::I32(-131072i32));
+    test(AtomicIsize::load, -131072isize, Token::I32(-131072));
+    test(AtomicU8::load, 127, Token::U8(127u8));
+    test(AtomicU16::load, 510u16, Token::U16(510u16));
+    test(AtomicU32::load, 131072u32, Token::U32(131072u32));
+    test(AtomicUsize::load, 131072usize, Token::U32(131072));
+
+    #[cfg(target_arch = "x86_64")]
+    {
+        test(AtomicI64::load, -8589934592, Token::I64(-8589934592));
+        test(AtomicU64::load, 8589934592u64, Token::U64(8589934592));
+    }
+}
+
 declare_error_tests! {
     test_unknown_field<StructDenyUnknown> {
         &[

test_suite/tests/test_ignored_any.rs

@@ -0,0 +1,104 @@
+use serde::de::value::{Error, MapDeserializer, SeqDeserializer};
+use serde::de::{
+    DeserializeSeed, EnumAccess, IgnoredAny, IntoDeserializer, VariantAccess, Visitor,
+};
+use serde::{forward_to_deserialize_any, Deserialize, Deserializer};
+
+#[derive(PartialEq, Debug, Deserialize)]
+enum Target {
+    Unit,
+    Newtype(i32),
+    Tuple(i32, i32),
+    Struct { a: i32 },
+}
+
+struct Enum(&'static str);
+
+impl<'de> Deserializer<'de> for Enum {
+    type Error = Error;
+
+    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+    where
+        V: Visitor<'de>,
+    {
+        visitor.visit_enum(self)
+    }
+
+    forward_to_deserialize_any! {
+        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
+        bytes byte_buf option unit unit_struct newtype_struct seq tuple
+        tuple_struct map struct enum identifier ignored_any
+    }
+}
+
+impl<'de> EnumAccess<'de> for Enum {
+    type Error = Error;
+    type Variant = Self;
+
+    fn variant_seed<V>(self, seed: V) -> Result<(V::Value, Self::Variant), Self::Error>
+    where
+        V: DeserializeSeed<'de>,
+    {
+        let v = seed.deserialize(self.0.into_deserializer())?;
+        Ok((v, self))
+    }
+}
+
+impl<'de> VariantAccess<'de> for Enum {
+    type Error = Error;
+
+    fn unit_variant(self) -> Result<(), Self::Error> {
+        Ok(())
+    }
+
+    fn newtype_variant_seed<T>(self, seed: T) -> Result<T::Value, Self::Error>
+    where
+        T: DeserializeSeed<'de>,
+    {
+        seed.deserialize(10i32.into_deserializer())
+    }
+
+    fn tuple_variant<V>(self, _len: usize, visitor: V) -> Result<V::Value, Self::Error>
+    where
+        V: Visitor<'de>,
+    {
+        let seq = SeqDeserializer::new(vec![1i32, 2].into_iter());
+        visitor.visit_seq(seq)
+    }
+
+    fn struct_variant<V>(
+        self,
+        _fields: &'static [&'static str],
+        visitor: V,
+    ) -> Result<V::Value, Self::Error>
+    where
+        V: Visitor<'de>,
+    {
+        let map = MapDeserializer::new(vec![("a", 10i32)].into_iter());
+        visitor.visit_map(map)
+    }
+}
+
+#[test]
+fn test_deserialize_enum() {
+    // First just make sure the Deserializer impl works
+    assert_eq!(Target::Unit, Target::deserialize(Enum("Unit")).unwrap());
+    assert_eq!(
+        Target::Newtype(10),
+        Target::deserialize(Enum("Newtype")).unwrap()
+    );
+    assert_eq!(
+        Target::Tuple(1, 2),
+        Target::deserialize(Enum("Tuple")).unwrap()
+    );
+    assert_eq!(
+        Target::Struct { a: 10 },
+        Target::deserialize(Enum("Struct")).unwrap()
+    );
+
+    // Now try IgnoredAny
+    IgnoredAny::deserialize(Enum("Unit")).unwrap();
+    IgnoredAny::deserialize(Enum("Newtype")).unwrap();
+    IgnoredAny::deserialize(Enum("Tuple")).unwrap();
+    IgnoredAny::deserialize(Enum("Struct")).unwrap();
+}

test_suite/tests/test_macros.rs

@@ -1466,6 +1466,34 @@ fn test_internally_tagged_struct_with_flattened_field() {
     );
 }
 
+#[test]
+fn test_untagged_enum_with_flattened_integer_key() {
+    #[derive(Debug, PartialEq, Serialize, Deserialize)]
+    #[serde(untagged)]
+    pub enum Untagged {
+        Variant {
+            #[serde(flatten)]
+            map: BTreeMap<u64, String>,
+        },
+    }
+
+    assert_tokens(
+        &Untagged::Variant {
+            map: {
+                let mut map = BTreeMap::new();
+                map.insert(100, "BTreeMap".to_owned());
+                map
+            },
+        },
+        &[
+            Token::Map { len: None },
+            Token::U64(100),
+            Token::Str("BTreeMap"),
+            Token::MapEnd,
+        ],
+    );
+}
+
 #[test]
 fn test_enum_in_untagged_enum() {
     #[derive(Debug, PartialEq, Serialize, Deserialize)]

test_suite/tests/test_ser.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::unreadable_literal)]
 #![cfg_attr(feature = "unstable", feature(never_type))]
 
 use std::cell::RefCell;
@@ -9,11 +10,17 @@ use std::num::Wrapping;
 use std::ops::Bound;
 use std::path::{Path, PathBuf};
 use std::rc::{Rc, Weak as RcWeak};
+use std::sync::atomic::{
+    AtomicBool, AtomicI16, AtomicI32, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, AtomicU8,
+    AtomicUsize,
+};
 use std::sync::{Arc, Weak as ArcWeak};
 use std::time::{Duration, UNIX_EPOCH};
 
 #[cfg(unix)]
 use std::str;
+#[cfg(target_arch = "x86_64")]
+use std::sync::atomic::{AtomicI64, AtomicU64};
 
 use fnv::FnvHasher;
 use serde::Serialize;
@@ -483,6 +490,26 @@ declare_tests! {
             Token::Str("1a"),
         ],
     }
+    test_atomic {
+        AtomicBool::new(false) => &[Token::Bool(false)],
+        AtomicBool::new(true) => &[Token::Bool(true)],
+        AtomicI8::new(63i8) => &[Token::I8(63i8)],
+        AtomicI16::new(-318i16) => &[Token::I16(-318i16)],
+        AtomicI32::new(65792i32) => &[Token::I32(65792i32)],
+        AtomicIsize::new(-65792isize) => &[Token::I64(-65792i64)],
+        AtomicU8::new(192u8) => &[Token::U8(192u8)],
+        AtomicU16::new(510u16) => &[Token::U16(510u16)],
+        AtomicU32::new(131072u32) => &[Token::U32(131072u32)],
+        AtomicUsize::new(655360usize) => &[Token::U64(655360u64)],
+    }
+}
+
+#[cfg(target_arch = "x86_64")]
+declare_tests! {
+    test_atomic64 {
+        AtomicI64::new(-4295032832i64) => &[Token::I64(-4295032832i64)],
+        AtomicU64::new(12884901888u64) => &[Token::U64(12884901888u64)],
+    }
 }
 
 declare_tests! {

test_suite/tests/test_value.rs

@@ -1,5 +1,8 @@
-use serde::de::{value, IntoDeserializer};
+use serde::de::value::{self, MapAccessDeserializer};
-use serde::Deserialize;
+use serde::de::{IntoDeserializer, MapAccess, Visitor};
+use serde::{Deserialize, Deserializer};
+use serde_test::{assert_de_tokens, Token};
+use std::fmt;
 
 #[test]
 fn test_u32_to_enum() {
@@ -32,3 +35,60 @@ fn test_integer128() {
     // i128 to i128
     assert_eq!(1i128, i128::deserialize(de_i128).unwrap());
 }
+
+#[test]
+fn test_map_access_to_enum() {
+    #[derive(PartialEq, Debug)]
+    struct Potential(PotentialKind);
+
+    #[derive(PartialEq, Debug, Deserialize)]
+    enum PotentialKind {
+        Airebo(Airebo),
+    }
+
+    #[derive(PartialEq, Debug, Deserialize)]
+    struct Airebo {
+        lj_sigma: f64,
+    }
+
+    impl<'de> Deserialize<'de> for Potential {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            struct PotentialVisitor;
+
+            impl<'de> Visitor<'de> for PotentialVisitor {
+                type Value = Potential;
+
+                fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                    write!(formatter, "a map")
+                }
+
+                fn visit_map<A>(self, map: A) -> Result<Self::Value, A::Error>
+                where
+                    A: MapAccess<'de>,
+                {
+                    Deserialize::deserialize(MapAccessDeserializer::new(map)).map(Potential)
+                }
+            }
+
+            deserializer.deserialize_any(PotentialVisitor)
+        }
+    }
+
+    let expected = Potential(PotentialKind::Airebo(Airebo { lj_sigma: 14.0 }));
+
+    assert_de_tokens(
+        &expected,
+        &[
+            Token::Map { len: Some(1) },
+            Token::Str("Airebo"),
+            Token::Map { len: Some(1) },
+            Token::Str("lj_sigma"),
+            Token::F64(14.0),
+            Token::MapEnd,
+            Token::MapEnd,
+        ],
+    );
+}

test_suite/tests/ui/borrow/bad_lifetimes.stderr

@@ -3,6 +3,3 @@ error: failed to parse borrowed lifetimes: "zzz"
   |
 5 |     #[serde(borrow = "zzz")]
   |                      ^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/borrow/duplicate_lifetime.stderr

@@ -3,6 +3,3 @@ error: duplicate borrowed lifetime `'a`
   |
 5 |     #[serde(borrow = "'a + 'a")]
   |                      ^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/borrow/duplicate_variant.stderr

@@ -3,6 +3,3 @@ error: duplicate serde attribute `borrow`
   |
 8 |     #[serde(borrow)]
   |             ^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/borrow/empty_lifetimes.stderr

@@ -3,6 +3,3 @@ error: at least one lifetime must be borrowed
   |
 5 |     #[serde(borrow = "")]
   |                      ^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/borrow/no_lifetimes.stderr

@@ -4,6 +4,3 @@ error: field `s` has no lifetimes to borrow
 5 | /     #[serde(borrow)]
 6 | |     s: String,
   | |_____________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/borrow/struct_variant.stderr

@@ -4,6 +4,3 @@ error: #[serde(borrow)] may only be used on newtype variants
 8 | /     #[serde(borrow)]
 9 | |     S { s: Str<'a> },
   | |____________________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/borrow/wrong_lifetime.stderr

@@ -4,6 +4,3 @@ error: field `s` does not have lifetime 'b
 5 | /     #[serde(borrow = "'b")]
 6 | |     s: &'a str,
   | |______________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/conflict/adjacent-tag.stderr

@@ -7,6 +7,3 @@ error: enum tags `conflict` for type and content conflict with each other
 7 | |     B,
 8 | | }
   | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/conflict/flatten-newtype-struct.stderr

@@ -3,6 +3,3 @@ error: #[serde(flatten)] cannot be used on newtype structs
   |
 6 | struct Foo(#[serde(flatten)] HashMap<String, String>);
   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/conflict/flatten-tuple-struct.stderr

@@ -3,6 +3,3 @@ error: #[serde(flatten)] cannot be used on tuple structs
   |
 6 | struct Foo(u32, #[serde(flatten)] HashMap<String, String>);
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/conflict/internal-tag-alias.stderr

@@ -9,6 +9,3 @@ error: variant field name `conflict` conflicts with internal tag
 9  | |     },
 10 | | }
    | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/conflict/internal-tag.stderr

@@ -9,6 +9,3 @@ error: variant field name `conflict` conflicts with internal tag
 9  | |     },
 10 | | }
    | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/default-attribute/enum.stderr

@@ -3,6 +3,3 @@ error: #[serde(default)] can only be used on structs with named fields
   |
 5 | enum E {
   | ^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/default-attribute/enum_path.stderr

@@ -3,6 +3,3 @@ error: #[serde(default = "...")] can only be used on structs with named fields
   |
 5 | enum E {
   | ^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/default-attribute/nameless_struct_fields.stderr

@@ -3,6 +3,3 @@ error: #[serde(default)] can only be used on structs with named fields
   |
 5 | struct T(u8, u8);
   |         ^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/default-attribute/nameless_struct_fields_path.stderr

@@ -3,6 +3,3 @@ error: #[serde(default = "...")] can only be used on structs with named fields
   |
 5 | struct T(u8, u8);
   |         ^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/duplicate-attribute/rename-and-ser.stderr

@@ -3,6 +3,3 @@ error: unknown serde field attribute `serialize`
   |
 5 |     #[serde(rename = "x", serialize = "y")]
   |                           ^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/duplicate-attribute/rename-ser-rename-ser.stderr

@@ -3,6 +3,3 @@ error: duplicate serde attribute `rename`
   |
 5 |     #[serde(rename(serialize = "x"), rename(serialize = "y"))]
   |                                      ^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/duplicate-attribute/rename-ser-rename.stderr

@@ -3,6 +3,3 @@ error: duplicate serde attribute `rename`
   |
 6 |     #[serde(rename = "y")]
   |             ^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/duplicate-attribute/rename-ser-ser.stderr

@@ -3,6 +3,3 @@ error: duplicate serde attribute `rename`
   |
 5 |     #[serde(rename(serialize = "x", serialize = "y"))]
   |                                     ^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/duplicate-attribute/two-rename-ser.stderr

@@ -3,6 +3,3 @@ error: duplicate serde attribute `rename`
   |
 6 |     #[serde(rename(serialize = "y"))]
   |             ^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/duplicate-attribute/with-and-serialize-with.stderr

@@ -3,6 +3,3 @@ error: duplicate serde attribute `serialize_with`
   |
 5 |     #[serde(with = "w", serialize_with = "s")]
   |                         ^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/enum-representation/content-no-tag.stderr

@@ -3,6 +3,3 @@ error: #[serde(tag = "...", content = "...")] must be used together
   |
 4 | #[serde(content = "c")]
   |         ^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/enum-representation/internal-tuple-variant.stderr

@@ -3,6 +3,3 @@ error: #[serde(tag = "...")] cannot be used with tuple variants
   |
 6 |     Tuple(u8, u8),
   |     ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/enum-representation/untagged-and-adjacent.stderr

@@ -15,6 +15,3 @@ error: untagged enum cannot have #[serde(tag = "...", content = "...")]
   |
 5 | #[serde(tag = "t", content = "c")]
   |                    ^^^^^^^
-
-error: aborting due to 3 previous errors
-

test_suite/tests/ui/enum-representation/untagged-and-content.stderr

@@ -9,6 +9,3 @@ error: untagged enum cannot have #[serde(content = "...")]
   |
 5 | #[serde(content = "c")]
   |         ^^^^^^^
-
-error: aborting due to 2 previous errors
-

test_suite/tests/ui/enum-representation/untagged-and-internal.stderr

@@ -9,6 +9,3 @@ error: enum cannot be both untagged and internally tagged
   |
 5 | #[serde(tag = "type")]
   |         ^^^
-
-error: aborting due to 2 previous errors
-

test_suite/tests/ui/enum-representation/untagged-struct.stderr

@@ -3,6 +3,3 @@ error: #[serde(untagged)] can only be used on enums
   |
 5 | struct S;
   | ^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/expected-string/boolean.stderr

@@ -3,6 +3,3 @@ error: expected serde rename attribute to be a string: `rename = "..."`
   |
 5 |     #[serde(rename = true)]
   |                      ^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/expected-string/byte_character.stderr

@@ -3,6 +3,3 @@ error: expected serde rename attribute to be a string: `rename = "..."`
   |
 5 |     #[serde(rename = b'a')]
   |                      ^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/expected-string/byte_string.stderr

@@ -3,6 +3,3 @@ error: expected serde rename attribute to be a string: `rename = "..."`
   |
 5 |     #[serde(rename = b"byte string")]
   |                      ^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/expected-string/character.stderr

@@ -3,6 +3,3 @@ error: expected serde rename attribute to be a string: `rename = "..."`
   |
 5 |     #[serde(rename = 'a')]
   |                      ^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/expected-string/float.stderr

@@ -3,6 +3,3 @@ error: expected serde rename attribute to be a string: `rename = "..."`
   |
 5 |     #[serde(rename = 3.14)]
   |                      ^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/expected-string/integer.stderr

@@ -3,6 +3,3 @@ error: expected serde rename attribute to be a string: `rename = "..."`
   |
 5 |     #[serde(rename = 100)]
   |                      ^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/both.stderr

@@ -9,6 +9,3 @@ error: #[serde(field_identifier)] and #[serde(variant_identifier)] cannot both b
   |
 4 | #[serde(field_identifier, variant_identifier)]
   |                           ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-

test_suite/tests/ui/identifier/field_struct.stderr

@@ -3,6 +3,3 @@ error: #[serde(field_identifier)] can only be used on an enum
   |
 5 | struct S;
   | ^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/field_tuple.stderr

@@ -3,6 +3,3 @@ error: #[serde(field_identifier)] may only contain unit variants
   |
 7 |     B(u8, u8),
   |     ^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/newtype_not_last.stderr

@@ -3,6 +3,3 @@ error: `Other` must be the last variant
   |
 7 |     Other(String),
   |     ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/not_unit.stderr

@@ -4,6 +4,3 @@ error: #[serde(other)] must be on a unit variant
 7 | /     #[serde(other)]
 8 | |     Other(u8, u8),
   | |_________________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/other_not_last.stderr

@@ -4,6 +4,3 @@ error: #[serde(other)] must be on the last variant
 7 | /     #[serde(other)]
 8 | |     Other,
   | |_________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/other_untagged.stderr

@@ -4,6 +4,3 @@ error: #[serde(other)] cannot appear on untagged enum
 6 | /     #[serde(other)]
 7 | |     Other,
   | |_________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/other_variant.stderr

@@ -4,6 +4,3 @@ error: #[serde(other)] may not be used on a variant identifier
 6 | /     #[serde(other)]
 7 | |     Other,
   | |_________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/variant_struct.stderr

@@ -3,6 +3,3 @@ error: #[serde(variant_identifier)] can only be used on an enum
   |
 5 | struct S;
   | ^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/identifier/variant_tuple.stderr

@@ -3,6 +3,3 @@ error: #[serde(variant_identifier)] may only contain unit variants
   |
 7 |     B(u8, u8),
   |     ^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/malformed/bound.stderr

@@ -3,6 +3,3 @@ error: malformed bound attribute, expected `bound(serialize = ..., deserialize =
   |
 5 |     #[serde(bound(unknown))]
   |                   ^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/malformed/rename.stderr

@@ -3,6 +3,3 @@ error: malformed rename attribute, expected `rename(serialize = ..., deserialize
   |
 5 |     #[serde(rename(unknown))]
   |                    ^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/precondition/deserialize_de_lifetime.stderr

@@ -3,6 +3,3 @@ error: cannot deserialize when there is a lifetime parameter called 'de
   |
 4 | struct S<'de> {
   |          ^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/precondition/deserialize_dst.stderr

@@ -6,6 +6,3 @@ error: cannot deserialize a dynamically sized struct
 6 | |     slice: [u8],
 7 | | }
   | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/precondition/serialize_field_identifier.stderr

@@ -7,6 +7,3 @@ error: field identifiers cannot be serialized
 7 | |     B,
 8 | | }
   | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/precondition/serialize_variant_identifier.stderr

@@ -7,6 +7,3 @@ error: variant identifiers cannot be serialized
 7 | |     B,
 8 | | }
   | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/remote/bad_getter.stderr

@@ -3,6 +3,3 @@ error: failed to parse path: "~~~"
    |
 12 |     #[serde(getter = "~~~")]
    |                      ^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/remote/bad_remote.stderr

@@ -3,6 +3,3 @@ error: failed to parse path: "~~~"
    |
 10 | #[serde(remote = "~~~")]
    |                  ^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/remote/enum_getter.stderr

@@ -9,6 +9,3 @@ error: #[serde(getter = "...")] is not allowed in an enum
 15 | |     },
 16 | | }
    | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/remote/missing_field.stderr

@@ -4,6 +4,4 @@ error[E0063]: missing field `b` in initializer of `remote::S`
 11 | #[serde(remote = "remote::S")]
    |                  ^^^^^^^^^^^ missing `b`
 
-error: aborting due to previous error
-
 For more information about this error, try `rustc --explain E0063`.

test_suite/tests/ui/remote/nonremote_getter.stderr

@@ -6,6 +6,3 @@ error: #[serde(getter = "...")] can only be used in structs that have #[serde(re
 6 | |     a: u8,
 7 | | }
   | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/remote/unknown_field.stderr

@@ -10,7 +10,5 @@ error[E0560]: struct `remote::S` has no field named `b`
 12 |     b: u8,
    |     ^ help: a field with a similar name exists: `a`
 
-error: aborting due to 2 previous errors
+Some errors have detailed explanations: E0560, E0609.
-
-Some errors occurred: E0560, E0609.
 For more information about an error, try `rustc --explain E0560`.

test_suite/tests/ui/remote/wrong_de.stderr

@@ -3,11 +3,5 @@ error[E0308]: mismatched types
   |
 7 | #[derive(Deserialize)]
   |          ^^^^^^^^^^^ expected u16, found u8
-help: you can cast an `u8` to `u16`, which will zero-extend the source value
-  |
-7 | #[derive(Deserialize.into())]
-  |          ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0308`.

test_suite/tests/ui/remote/wrong_getter.stderr

@@ -7,6 +7,4 @@ error[E0308]: mismatched types
    = note: expected type `&u8`
               found type `&u16`
 
-error: aborting due to previous error
-
 For more information about this error, try `rustc --explain E0308`.

test_suite/tests/ui/remote/wrong_ser.stderr

@@ -7,6 +7,4 @@ error[E0308]: mismatched types
   = note: expected type `&u8`
              found type `&u16`
 
-error: aborting due to previous error
-
 For more information about this error, try `rustc --explain E0308`.

test_suite/tests/ui/rename/container_unknown_rename_rule.stderr

@@ -3,6 +3,3 @@ error: unknown rename rule for #[serde(rename_all = "abc")]
   |
 4 | #[serde(rename_all = "abc")]
   |                      ^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/rename/variant_unknown_rename_rule.stderr

@@ -3,6 +3,3 @@ error: unknown rename rule for #[serde(rename_all = "abc")]
   |
 5 |     #[serde(rename_all = "abc")]
   |                          ^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/struct-representation/internally-tagged-tuple.stderr

@@ -3,6 +3,3 @@ error: #[serde(tag = "...")] can only be used on enums and structs with named fi
   |
 5 | struct S(u8, u8);
   |         ^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/struct-representation/internally-tagged-unit.stderr

@@ -3,6 +3,3 @@ error: #[serde(tag = "...")] can only be used on enums and structs with named fi
   |
 3 | #[derive(Serialize)]
   |          ^^^^^^^^^
-
-error: aborting due to previous error
-

test_suite/tests/ui/transparent/at_most_one.stderr

@@ -7,6 +7,3 @@ error: #[serde(transparent)] requires struct to have at most one transparent fie
 7 | |     b: u8,
 8 | | }
   | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/transparent/de_at_least_one.stderr

@@ -9,6 +9,3 @@ error: #[serde(transparent)] requires at least one field that is neither skipped
 9  | |     b: u8,
 10 | | }
    | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/transparent/enum.stderr

@@ -4,6 +4,3 @@ error: #[serde(transparent)] is not allowed on an enum
 4 | / #[serde(transparent)]
 5 | | enum E {}
   | |_________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/transparent/ser_at_least_one.stderr

@@ -7,6 +7,3 @@ error: #[serde(transparent)] requires at least one field that is not skipped
 7 | |     a: u8,
 8 | | }
   | |_^
-
-error: aborting due to previous error
-

test_suite/tests/ui/transparent/unit_struct.stderr

@@ -4,6 +4,3 @@ error: #[serde(transparent)] is not allowed on a unit struct
 4 | / #[serde(transparent)]
 5 | | struct S;
   | |_________^
-
-error: aborting due to previous error
-

test_suite/tests/ui/transparent/with_from.stderr

@@ -6,6 +6,3 @@ error: #[serde(transparent)] is not allowed with #[serde(from = "...")]
 6 | |     a: u8,
 7 | | }
   | |_^
-
-error: aborting due to previous error
-