nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SmallCStr conversion from CStr

Browse Source
This commit is contained in:
Eric Huss 2024-02-14 18:40:53 -08:00
parent ee9c7c940c
commit 217e5e484d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_data_structures/src/small_c_str.rs
View File

@ -82,6 +82,6 @@ impl<'a> FromIterator<&'a str> for SmallCStr {
impl From<&ffi::CStr> for SmallCStr { impl From<&ffi::CStr> for SmallCStr {
fn from(s: &ffi::CStr) -> Self { fn from(s: &ffi::CStr) -> Self {
Self { data: SmallVec::from_slice(s.to_bytes()) } Self { data: SmallVec::from_slice(s.to_bytes_with_nul()) }
} }
} }

8
compiler/rustc_data_structures/src/small_c_str/tests.rs
View File

@ -43,3 +43,11 @@ fn long() {
fn internal_nul() { fn internal_nul() {
let _ = SmallCStr::new("abcd\0def"); let _ = SmallCStr::new("abcd\0def");
} }
#[test]
fn from_cstr() {
let c = c"foo";
let s: SmallCStr = c.into();
assert_eq!(s.len_with_nul(), 4);
assert_eq!(s.as_c_str(), c"foo");
}