Merge branch 'serde-rs:master' into json_map_with_capacity

Author: zachs18

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         os: [ubuntu, windows]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@nightly
       - run: cargo test
       - run: cargo test --features preserve_order --tests -- --skip ui --exact
@@ -39,7 +39,7 @@ jobs:
           - rust: stable
             os: windows
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
@@ -68,12 +68,10 @@ jobs:
     name: Miri
     runs-on: ubuntu-latest
     env:
-      MIRIFLAGS: "-Zmiri-tag-raw-pointers"
+      MIRIFLAGS: -Zmiri-strict-provenance
     steps:
-      - uses: actions/checkout@v2
-      - uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: miri
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@miri
       - run: cargo miri test
       - run: cargo miri test --features preserve_order,float_roundtrip,arbitrary_precision,raw_value
 
@@ -82,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@clippy
       - run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
       - run: cargo clippy --all-features --tests -- -Dclippy::all -Dclippy::pedantic
@@ -91,7 +89,7 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@nightly
       - run: cargo doc --features raw_value,unbounded_depth
         env:
@@ -101,7 +99,7 @@ jobs:
     name: Fuzz
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@nightly
       - run: cargo install cargo-fuzz --debug
       - run: cargo fuzz build -O

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_json"
-version = "1.0.79" # remember to update html_root_url
+version = "1.0.81" # remember to update html_root_url
 authors = ["Erick Tryzelaar <[email protected]>", "David Tolnay <[email protected]>"]
 license = "MIT OR Apache-2.0"
 description = "A JSON serialization file format"
@@ -14,7 +14,7 @@ rust-version = "1.36"
 
 [dependencies]
 serde = { version = "1.0.100", default-features = false }
-indexmap = { version = "1.5", optional = true }
+indexmap = { version = "1.5.2", features = ["std"], optional = true }
 itoa = "1.0"
 ryu = "1.0"
 
@@ -56,7 +56,7 @@ alloc = ["serde/alloc"]
 # Make serde_json::Map use a representation which maintains insertion order.
 # This allows data to be read into a Value and written back to a JSON string
 # while preserving the order of map keys in the input.
-preserve_order = ["indexmap"]
+preserve_order = ["indexmap", "std"]
 
 # Use sufficient precision when parsing fixed precision floats from JSON to
 # ensure that they maintain accuracy when round-tripped through JSON. This comes

src/lib.rs

@@ -300,7 +300,7 @@
 //! [macro]: https://docs.serde.rs/serde_json/macro.json.html
 //! [`serde-json-core`]: https://github.com/rust-embedded-community/serde-json-core
 
-#![doc(html_root_url = "https://docs.rs/serde_json/1.0.79")]
+#![doc(html_root_url = "https://docs.rs/serde_json/1.0.81")]
 // Ignored clippy lints
 #![allow(
     clippy::collapsible_else_if,

src/map.rs

@@ -193,7 +193,7 @@ impl Map<String, Value> {
         }
     }
 
-    /// Moves all elements from other into Self, leaving other empty.
+    /// Moves all elements from other into self, leaving other empty.
     #[inline]
     pub fn append(&mut self, other: &mut Self) {
         #[cfg(feature = "preserve_order")]

src/value/ser.rs

@@ -273,9 +273,9 @@ impl serde::Serializer for Serializer {
         })
     }
 
-    fn collect_str<T: ?Sized>(self, value: &T) -> Result<Value>
+    fn collect_str<T>(self, value: &T) -> Result<Value>
     where
-        T: Display,
+        T: ?Sized + Display,
     {
         Ok(Value::String(value.to_string()))
     }
@@ -606,9 +606,9 @@ impl serde::Serializer for MapKeySerializer {
         Err(key_must_be_a_string())
     }
 
-    fn collect_str<T: ?Sized>(self, value: &T) -> Result<String>
+    fn collect_str<T>(self, value: &T) -> Result<String>
     where
-        T: Display,
+        T: ?Sized + Display,
     {
         Ok(value.to_string())
     }

tests/regression/issue845.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::trait_duplication_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/8757
+
 use serde::{Deserialize, Deserializer};
 use std::convert::TryFrom;
 use std::fmt::{self, Display};