mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stabilize Deserialize for Box<CStr>

Browse Source
This commit is contained in:
David Tolnay 2018-05-26 09:48:50 -07:00
parent 1385aac208
commit 7ec3cac7d6
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serde/build.rs
View File

@ -33,6 +33,12 @@ fn main() {
Err(_) => return, Err(_) => return,
}; };
// CString::into_boxed_c_str stabilized in Rust 1.20:
// https://doc.rust-lang.org/std/ffi/struct.CString.html#method.into_boxed_c_str
if minor >= 20 {
println!("cargo:rustc-cfg=de_boxed_c_str");
}
// 128-bit integers stabilized in Rust 1.26: // 128-bit integers stabilized in Rust 1.26:
// https://blog.rust-lang.org/2018/05/10/Rust-1.26.html // https://blog.rust-lang.org/2018/05/10/Rust-1.26.html
if minor >= 26 { if minor >= 26 {

2
serde/src/de/impls.rs
View File

@ -573,7 +573,7 @@ macro_rules! forwarded_impl {
} }
} }
#[cfg(all(feature = "std", feature = "unstable"))] #[cfg(all(feature = "std", de_boxed_c_str))]
forwarded_impl!((), Box<CStr>, CString::into_boxed_c_str); forwarded_impl!((), Box<CStr>, CString::into_boxed_c_str);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////