Merge pull request #339 from djmitche/uuid-len-const

use TC_UUID_STRING_BYTES constant directly
This commit is contained in:
Dustin J. Mitchell 2022-03-07 10:55:28 -05:00 committed by GitHub
commit fcdcebb1e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions

1
Cargo.lock generated
View file

@ -3039,7 +3039,6 @@ dependencies = [
"libc",
"pretty_assertions",
"taskchampion",
"uuid",
]
[[package]]

View file

@ -11,7 +11,6 @@ crate-type = ["staticlib", "cdylib"]
libc = "0.2.113"
chrono = "^0.4.10"
taskchampion = { path = "../taskchampion" }
uuid = { version = "^0.8.2", features = ["v4"] }
anyhow = "1.0"
[dev-dependencies]

View file

@ -87,9 +87,8 @@ pub unsafe extern "C" fn tc_uuid_to_buf(tcuuid: TCUuid, buf: *mut libc::c_char)
// - content of buf will not be mutated during the lifetime of this slice (lifetime
// does not outlive this function call)
// - the length of the buffer is less than isize::MAX (promised by caller)
let buf: &mut [u8] = unsafe {
std::slice::from_raw_parts_mut(buf as *mut u8, ::uuid::adapter::Hyphenated::LENGTH)
};
let buf: &mut [u8] =
unsafe { std::slice::from_raw_parts_mut(buf as *mut u8, TC_UUID_STRING_BYTES) };
// SAFETY:
// - tcuuid is a valid TCUuid (all byte patterns are valid)
let uuid: Uuid = unsafe { TCUuid::val_from_arg(tcuuid) };