diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index 156169de..8731ae67 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -948,20 +948,20 @@ struct PathBufVisitor; #[cfg(feature = "std")] impl<'de> Visitor<'de> for PathBufVisitor { - type Value = path::PathBuf; + type Value = PathBuf; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { formatter.write_str("path string") } - fn visit_str(self, v: &str) -> Result + fn visit_str(self, v: &str) -> Result where E: Error, { Ok(From::from(v)) } - fn visit_string(self, v: String) -> Result + fn visit_string(self, v: String) -> Result where E: Error, { @@ -971,8 +971,8 @@ impl<'de> Visitor<'de> for PathBufVisitor { #[cfg(feature = "std")] -impl<'de> Deserialize<'de> for path::PathBuf { - fn deserialize(deserializer: D) -> Result +impl<'de> Deserialize<'de> for PathBuf { + fn deserialize(deserializer: D) -> Result where D: Deserializer<'de>, { diff --git a/serde/src/lib.rs b/serde/src/lib.rs index de44550b..e83cfde9 100644 --- a/serde/src/lib.rs +++ b/serde/src/lib.rs @@ -162,7 +162,7 @@ mod lib { pub use collections::{BinaryHeap, BTreeMap, BTreeSet, LinkedList, VecDeque}; #[cfg(feature = "std")] - pub use std::{error, net, path}; + pub use std::{error, net}; #[cfg(feature = "std")] pub use std::collections::{HashMap, HashSet}; @@ -173,6 +173,8 @@ mod lib { #[cfg(feature = "std")] pub use std::io::Write; #[cfg(feature = "std")] + pub use std::path::{Path, PathBuf}; + #[cfg(feature = "std")] pub use std::time::Duration; #[cfg(feature = "unstable")] diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs index 291c6670..590fb951 100644 --- a/serde/src/ser/impls.rs +++ b/serde/src/ser/impls.rs @@ -472,7 +472,7 @@ impl Serialize for net::SocketAddrV6 { //////////////////////////////////////////////////////////////////////////////// #[cfg(feature = "std")] -impl Serialize for path::Path { +impl Serialize for Path { fn serialize(&self, serializer: S) -> Result where S: Serializer, @@ -485,7 +485,7 @@ impl Serialize for path::Path { } #[cfg(feature = "std")] -impl Serialize for path::PathBuf { +impl Serialize for PathBuf { fn serialize(&self, serializer: S) -> Result where S: Serializer,