Deserialize Box<Path> through PathBuf::into_boxed_path

heftig · heftig · commit b8772a1e402b · 2019-10-22T22:31:51.000+02:00
Including Rc<Path> et al. Fixes #1633
diff --git a/serde/build.rs b/serde/build.rs
@@ -29,8 +29,9 @@ fn main() {
         println!("cargo:rustc-cfg=core_reverse");
     }
 
-    // CString::into_boxed_c_str stabilized in Rust 1.20:
+    // CString::into_boxed_c_str and PathBuf::into_boxed_path stabilized in Rust 1.20:
     // https://doc.rust-lang.org/std/ffi/struct.CString.html#method.into_boxed_c_str
+    // https://doc.rust-lang.org/std/path/struct.PathBuf.html#method.into_boxed_path
     if minor >= 20 {
         println!("cargo:rustc-cfg=de_boxed_c_str");
     }
diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs
@@ -1610,6 +1610,9 @@ impl<'de> Deserialize<'de> for PathBuf {
     }
 }
 
+#[cfg(all(feature = "std", de_boxed_c_str))]
+forwarded_impl!((), Box<Path>, PathBuf::into_boxed_path);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // If this were outside of the serde crate, it would just use:
diff --git a/test_suite/tests/test_de.rs b/test_suite/tests/test_de.rs
@@ -907,6 +907,20 @@ declare_tests! {
             Token::ByteBuf(b"/usr/local/lib"),
         ],
     }
+    test_boxed_path {
+        PathBuf::from("/usr/local/lib").into_boxed_path() => &[
+            Token::Str("/usr/local/lib"),
+        ],
+        PathBuf::from("/usr/local/lib").into_boxed_path() => &[
+            Token::String("/usr/local/lib"),
+        ],
+        PathBuf::from("/usr/local/lib").into_boxed_path() => &[
+            Token::Bytes(b"/usr/local/lib"),
+        ],
+        PathBuf::from("/usr/local/lib").into_boxed_path() => &[
+            Token::ByteBuf(b"/usr/local/lib"),
+        ],
+    }
     test_cstring {
         CString::new("abc").unwrap() => &[
             Token::Bytes(b"abc"),

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,9 @@ fn main() {`
`29`	`29`	`println!("cargo:rustc-cfg=core_reverse");`
`30`	`30`	`}`
`31`	`31`
`32`		`- // CString::into_boxed_c_str stabilized in Rust 1.20:`
	`32`	`+ // CString::into_boxed_c_str and PathBuf::into_boxed_path stabilized in Rust 1.20:`
`33`	`33`	`// https://doc.rust-lang.org/std/ffi/struct.CString.html#method.into_boxed_c_str`
	`34`	`+ // https://doc.rust-lang.org/std/path/struct.PathBuf.html#method.into_boxed_path`
`34`	`35`	`if minor >= 20 {`
`35`	`36`	`println!("cargo:rustc-cfg=de_boxed_c_str");`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1610,6 +1610,9 @@ impl<'de> Deserialize<'de> for PathBuf {`
`1610`	`1610`	`}`
`1611`	`1611`	`}`
`1612`	`1612`
	`1613`	`+#[cfg(all(feature = "std", de_boxed_c_str))]`
	`1614`	`+forwarded_impl!((), Box<Path>, PathBuf::into_boxed_path);`
	`1615`	`+`
`1613`	`1616`	`////////////////////////////////////////////////////////////////////////////////`
`1614`	`1617`
`1615`	`1618`	`// If this were outside of the serde crate, it would just use:`