Merge pull request #1543 from jplatte/alloc-de-compile-fix

Fix a compile error in derive(Deserialize) with no_std + alloc
serde-rs · May 31, 2019 · 0a3eeab · 0a3eeab
2 parents 0726623 + e4e110e
commit 0a3eeab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/serde/src/export.rs b/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::*;

diff --git a/serde_derive/src/de.rs b/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);