From 3092a6bb7f66f6fbe45f5780129be9e2276da0de Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@mozilla.com>
Date: Fri, 27 Nov 2020 20:08:54 -0500
Subject: [PATCH] do not require taskchampion from sync-server

---
 Cargo.lock                               | 2 +-
 sync-server/Cargo.toml                   | 2 +-
 sync-server/src/api/add_version.rs       | 2 +-
 sync-server/src/api/get_child_version.rs | 2 +-
 sync-server/src/server.rs                | 2 +-
 sync-server/src/storage/mod.rs           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 877cd2b16..97bccecac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2048,7 +2048,7 @@ dependencies = [
  "actix-web",
  "failure",
  "futures",
- "taskchampion",
+ "uuid",
 ]
 
 [[package]]
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 2e0ef9db8..109f7d393 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+uuid = { version = "0.8.1", features = ["serde", "v4"] }
 actix-web = "3.3.0"
 failure = "0.1.8"
-taskchampion = { path = "../taskchampion" }
 futures = "0.3.8"
 
 [dev-dependencies]
diff --git a/sync-server/src/api/add_version.rs b/sync-server/src/api/add_version.rs
index 770ce2abc..5c5b7c87f 100644
--- a/sync-server/src/api/add_version.rs
+++ b/sync-server/src/api/add_version.rs
@@ -74,7 +74,7 @@ mod test {
     use crate::app_scope;
     use crate::storage::{InMemoryStorage, Storage};
     use actix_web::{http::StatusCode, test, App};
-    use taskchampion::Uuid;
+    use uuid::Uuid;
 
     #[actix_rt::test]
     async fn test_success() {
diff --git a/sync-server/src/api/get_child_version.rs b/sync-server/src/api/get_child_version.rs
index 83f9e2224..cc6aabd16 100644
--- a/sync-server/src/api/get_child_version.rs
+++ b/sync-server/src/api/get_child_version.rs
@@ -45,7 +45,7 @@ mod test {
     use crate::app_scope;
     use crate::storage::{InMemoryStorage, Storage};
     use actix_web::{http::StatusCode, test, App};
-    use taskchampion::Uuid;
+    use uuid::Uuid;
 
     #[actix_rt::test]
     async fn test_success() {
diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index 0a404172d..b804d69a3 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -2,7 +2,7 @@
 //! invariants, and so on.
 use crate::storage::{Client, StorageTxn};
 use failure::Fallible;
-use taskchampion::Uuid;
+use uuid::Uuid;
 
 /// The distinguished value for "no version"
 pub const NO_VERSION_ID: VersionId = Uuid::nil();
diff --git a/sync-server/src/storage/mod.rs b/sync-server/src/storage/mod.rs
index 2915f3c4d..44949e144 100644
--- a/sync-server/src/storage/mod.rs
+++ b/sync-server/src/storage/mod.rs
@@ -1,5 +1,5 @@
 use failure::Fallible;
-use taskchampion::Uuid;
+use uuid::Uuid;
 
 mod inmemory;
 pub(crate) use inmemory::InMemoryStorage;