From af9bb1fcfe4874cb8e8f9fb34e3d8d316b276ad3 Mon Sep 17 00:00:00 2001 From: Mark Watts Date: Fri, 2 Jul 2021 17:11:28 -0400 Subject: [PATCH] add packages to workspace --- Cargo.toml | 15 ++++++++++----- edn/src/namespaceable_name.rs | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a97b1960..760cf986 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,12 @@ sqlcipher = ["rusqlite/sqlcipher", "mentat_db/sqlcipher"] syncable = ["mentat_tolstoy", "tolstoy_traits", "mentat_db/syncable"] [workspace] -members = ["tools/cli", "ffi"] +members = [ + "tools/cli", + "ffi", "core", "core-traits","db", "db-traits", "edn", "public-traits", "query-algebrizer", + "query-algebrizer-traits", "query-projector", "query-projector-traits","query-pull", + "query-sql", "sql", "sql-traits", "tolstoy-traits", "tolstoy", "transaction" + ] [build-dependencies] rustc_version = "~0.4" @@ -32,10 +37,10 @@ rustc_version = "~0.4" [dev-dependencies] assert_approx_eq = "~1.1" -[dev-dependencies.cargo-husky] -version = "1" -default-features = false # Disable features which are enabled by default -features = ["run-for-all", "precommit-hook", "run-cargo-fmt", "run-cargo-test", "run-cargo-check", "run-cargo-clippy"] +#[dev-dependencies.cargo-husky] +#version = "1" +#default-features = false # Disable features which are enabled by default +#features = ["run-for-all", "precommit-hook", "run-cargo-fmt", "run-cargo-test", "run-cargo-check", "run-cargo-clippy"] #cargo audit #cargo outdated diff --git a/edn/src/namespaceable_name.rs b/edn/src/namespaceable_name.rs index 3c8e52a8..722aff46 100644 --- a/edn/src/namespaceable_name.rs +++ b/edn/src/namespaceable_name.rs @@ -205,8 +205,8 @@ impl fmt::Display for NamespaceableName { // friendly and automatic (e.g. `derive`d), and just pass all work off to it in our custom // implementation of Serialize and Deserialize. #[cfg(feature = "serde_support")] -#[cfg_attr(feature = "serde_support", serde(rename = "NamespaceableName"))] #[cfg_attr(feature = "serde_support", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde_support", serde(rename = "NamespaceableName"))] struct SerializedNamespaceableName<'a> { namespace: Option<&'a str>, name: &'a str,