Fix tests

serde-rs · Aug 5, 2018 · 8eb195e · 8eb195e
1 parent 8b2e6ba
commit 8eb195e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/serde/build.rs b/serde/build.rs
@@ -36,6 +36,12 @@ fn main() {
         println!("cargo:rustc-cfg=integer128");
     }
 
+    // Inclusive ranges methods stabilized in Rust 1.27:
+    // https://github.com/rust-lang/rust/pull/50758
+    if minor >= 27 {
+        println!("cargo:rustc-cfg=range_inclusive");
+    }
+
     // Non-zero integers stabilized in Rust 1.28:
     // https://github.com/rust-lang/rust/pull/50808
     if minor >= 28 {

diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs
@@ -2196,8 +2196,8 @@ where
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#[cfg(feature = "std")]
-impl<'de, Idx> Deserialize<'de> for ops::RangeInclusive<Idx>
+#[cfg(range_inclusive)]
+impl<'de, Idx> Deserialize<'de> for RangeInclusive<Idx>
 where
     Idx: Deserialize<'de>,
 {
@@ -2243,7 +2243,7 @@ where
                             b"start" => Ok(Field::Start),
                             b"end" => Ok(Field::End),
                             _ => {
-                                let value = String::from_utf8_lossy(value);
+                                let value = ::export::from_utf8_lossy(value);
                                 Err(Error::unknown_field(&value, FIELDS))
                             }
                         }
@@ -2262,7 +2262,7 @@ where
         where
             Idx: Deserialize<'de>,
         {
-            type Value = ops::RangeInclusive<Idx>;
+            type Value = RangeInclusive<Idx>;
 
             fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
                 formatter.write_str("struct RangeInclusive")
@@ -2284,7 +2284,7 @@ where
                         return Err(Error::invalid_length(1, &self));
                     }
                 };
-                Ok(start..=end)
+                Ok(RangeInclusive::new(start, end))
             }
 
             fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
@@ -2317,7 +2317,7 @@ where
                     Some(end) => end,
                     None => return Err(<A::Error as Error>::missing_field("end")),
                 };
-                Ok(start..=end)
+                Ok(RangeInclusive::new(start, end))
             }
         }
 

diff --git a/serde/src/lib.rs b/serde/src/lib.rs
@@ -226,6 +226,9 @@ mod lib {
 
     #[cfg(any(core_duration, feature = "std"))]
     pub use self::core::time::Duration;
+
+    #[cfg(range_inclusive)]
+    pub use self::core::ops::RangeInclusive;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs
@@ -246,8 +246,8 @@ where
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#[cfg(feature = "std")]
-impl<Idx> Serialize for ops::RangeInclusive<Idx>
+#[cfg(range_inclusive)]
+impl<Idx> Serialize for RangeInclusive<Idx>
 where
     Idx: Serialize,
 {