gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source 
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
parent a7f353bd6e 43ab50db42
commit fcdcebb1e0
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

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

1
lib/Cargo.toml
View File

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

5
lib/src/uuid.rs
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 // - content of buf will not be mutated during the lifetime of this slice (lifetime
// does not outlive this function call) // does not outlive this function call)
// - the length of the buffer is less than isize::MAX (promised by caller) // - the length of the buffer is less than isize::MAX (promised by caller)
let buf: &mut [u8] = unsafe { let buf: &mut [u8] =
std::slice::from_raw_parts_mut(buf as *mut u8, ::uuid::adapter::Hyphenated::LENGTH) unsafe { std::slice::from_raw_parts_mut(buf as *mut u8, TC_UUID_STRING_BYTES) };
};
// SAFETY: // SAFETY:
// - tcuuid is a valid TCUuid (all byte patterns are valid) // - tcuuid is a valid TCUuid (all byte patterns are valid)
let uuid: Uuid = unsafe { TCUuid::val_from_arg(tcuuid) }; let uuid: Uuid = unsafe { TCUuid::val_from_arg(tcuuid) };