diff --git a/Cargo.lock b/Cargo.lock index c717d2849..d3d6f3b81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1436,9 +1436,9 @@ dependencies = [ [[package]] name = "taskchampion" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9e2d64086cc515f801ba0e1f366e5e029dd47db3c499a9e173a60b62145410" +checksum = "55b167a2bea718f6f75f68c8d29f1550a6095d8917504d3b9c62626f4c4ef7cb" dependencies = [ "anyhow", "byteorder", @@ -1715,9 +1715,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", "serde", diff --git a/Cargo.toml b/Cargo.toml index d4bbe3f5c..b8e486d6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,4 +15,4 @@ ffizz-header = "0.5" libc = "0.2.136" pretty_assertions = "1" regex = "^1.10.2" -taskchampion = "0.5" +taskchampion = "0.6" diff --git a/src/tc/lib/src/server.rs b/src/tc/lib/src/server.rs index 47b79debc..023782a9c 100644 --- a/src/tc/lib/src/server.rs +++ b/src/tc/lib/src/server.rs @@ -33,7 +33,7 @@ impl AsMut> for TCServer { } } -/// Utility function to allow using `?` notation to return an error value. +/// Utility function to allow using `?` notation to return an error value. fn wrap(f: F, error_out: *mut TCString, err_value: T) -> T where F: FnOnce() -> anyhow::Result, @@ -125,7 +125,7 @@ pub unsafe extern "C" fn tc_server_new_sync( // SAFETY: // - origin is valid (promised by caller) // - origin ownership is transferred to this function - let origin = unsafe { TCString::val_from_arg(origin) }.into_string()?; + let url = unsafe { TCString::val_from_arg(origin) }.into_string()?; // SAFETY: // - client_id is a valid Uuid (any 8-byte sequence counts) @@ -139,7 +139,7 @@ pub unsafe extern "C" fn tc_server_new_sync( .to_vec(); let server_config = ServerConfig::Remote { - origin, + url, client_id, encryption_secret, };