4 files changed, 15 insertions, 9 deletions
diff --git a/vendor/serde_json/tests/lexical.rs b/vendor/serde_json/tests/lexical.rs
index d3dfb852b..368c84478 100644
--- a/vendor/serde_json/tests/lexical.rs
+++ b/vendor/serde_json/tests/lexical.rs
@@ -26,11 +26,6 @@ extern crate alloc;
 #[path = "../src/lexical/mod.rs"]
 mod lexical;
 
-mod lib {
-    pub use std::vec::Vec;
-    pub use std::{cmp, iter, mem, ops};
-}
-
 #[path = "lexical/algorithm.rs"]
 mod algorithm;
 
diff --git a/vendor/serde_json/tests/lexical/parse.rs b/vendor/serde_json/tests/lexical/parse.rs
index 80ca25e77..03ec1a9a6 100644
--- a/vendor/serde_json/tests/lexical/parse.rs
+++ b/vendor/serde_json/tests/lexical/parse.rs
@@ -1,7 +1,7 @@
 // Adapted from https://github.com/Alexhuszagh/rust-lexical.
 
 use crate::lexical::num::Float;
-use crate::lexical::parse::{parse_concise_float, parse_truncated_float};
+use crate::lexical::{parse_concise_float, parse_truncated_float};
 use core::f64;
 use core::fmt::Debug;
 
diff --git a/vendor/serde_json/tests/map.rs b/vendor/serde_json/tests/map.rs
index ae0196956..538cd16ae 100644
--- a/vendor/serde_json/tests/map.rs
+++ b/vendor/serde_json/tests/map.rs
@@ -35,7 +35,6 @@ fn test_append() {
     assert!(val.is_empty());
 }
 
-#[cfg(not(no_btreemap_retain))]
 #[test]
 fn test_retain() {
     let mut v: Value = from_str(r#"{"b":null,"a":null,"c":null}"#).unwrap();
diff --git a/vendor/serde_json/tests/test.rs b/vendor/serde_json/tests/test.rs
index e548b7dae..a38435069 100644
--- a/vendor/serde_json/tests/test.rs
+++ b/vendor/serde_json/tests/test.rs
@@ -160,17 +160,29 @@ fn test_write_f64() {
 
 #[test]
 fn test_encode_nonfinite_float_yields_null() {
-    let v = to_value(::std::f64::NAN).unwrap();
+    let v = to_value(::std::f64::NAN.copysign(1.0)).unwrap();
+    assert!(v.is_null());
+
+    let v = to_value(::std::f64::NAN.copysign(-1.0)).unwrap();
     assert!(v.is_null());
 
     let v = to_value(::std::f64::INFINITY).unwrap();
     assert!(v.is_null());
 
-    let v = to_value(::std::f32::NAN).unwrap();
+    let v = to_value(-::std::f64::INFINITY).unwrap();
+    assert!(v.is_null());
+
+    let v = to_value(::std::f32::NAN.copysign(1.0)).unwrap();
+    assert!(v.is_null());
+
+    let v = to_value(::std::f32::NAN.copysign(-1.0)).unwrap();
     assert!(v.is_null());
 
     let v = to_value(::std::f32::INFINITY).unwrap();
     assert!(v.is_null());
+
+    let v = to_value(-::std::f32::INFINITY).unwrap();
+    assert!(v.is_null());
 }
 
 #[test]