GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #65 from djmitche/issue63

Browse source 
do not require taskchampion from sync-server
This commit is contained in:
Dustin J. Mitchell 2020-11-27 20:15:25 -05:00 • committed by GitHub
commit a02f864b87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2048,7 +2048,7 @@ dependencies = [
"actix-web", "actix-web",
"failure", "failure",
"futures", "futures",
"taskchampion", "uuid",
] ]
[[package]] [[package]]

2
sync-server/Cargo.toml
View file

@ -7,9 +7,9 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
uuid = { version = "0.8.1", features = ["serde", "v4"] }
actix-web = "3.3.0" actix-web = "3.3.0"
failure = "0.1.8" failure = "0.1.8"
taskchampion = { path = "../taskchampion" }
futures = "0.3.8" futures = "0.3.8"
[dev-dependencies] [dev-dependencies]

2
sync-server/src/api/add_version.rs
View file

@ -74,7 +74,7 @@ mod test {
use crate::app_scope; use crate::app_scope;
use crate::storage::{InMemoryStorage, Storage}; use crate::storage::{InMemoryStorage, Storage};
use actix_web::{http::StatusCode, test, App}; use actix_web::{http::StatusCode, test, App};
use taskchampion::Uuid; use uuid::Uuid;
#[actix_rt::test] #[actix_rt::test]
async fn test_success() { async fn test_success() {

2
sync-server/src/api/get_child_version.rs
View file

@ -45,7 +45,7 @@ mod test {
use crate::app_scope; use crate::app_scope;
use crate::storage::{InMemoryStorage, Storage}; use crate::storage::{InMemoryStorage, Storage};
use actix_web::{http::StatusCode, test, App}; use actix_web::{http::StatusCode, test, App};
use taskchampion::Uuid; use uuid::Uuid;
#[actix_rt::test] #[actix_rt::test]
async fn test_success() { async fn test_success() {

2
sync-server/src/server.rs
View file

@ -2,7 +2,7 @@
//! invariants, and so on. //! invariants, and so on.
use crate::storage::{Client, StorageTxn}; use crate::storage::{Client, StorageTxn};
use failure::Fallible; use failure::Fallible;
use taskchampion::Uuid; use uuid::Uuid;
/// The distinguished value for "no version" /// The distinguished value for "no version"
pub const NO_VERSION_ID: VersionId = Uuid::nil(); pub const NO_VERSION_ID: VersionId = Uuid::nil();

2
sync-server/src/storage/mod.rs
View file

@ -1,5 +1,5 @@
use failure::Fallible; use failure::Fallible;
use taskchampion::Uuid; use uuid::Uuid;
mod inmemory; mod inmemory;
pub(crate) use inmemory::InMemoryStorage; pub(crate) use inmemory::InMemoryStorage;