From 91e501d1966aad0269f8f8288bb90e77b177d28e Mon Sep 17 00:00:00 2001 From: Charles d'Avernas Date: Wed, 22 Jan 2025 09:38:41 +0100 Subject: [PATCH] Fix the `map` file by fully qualifying the serde/derive macros Closes #3 Signed-off-by: Charles d'Avernas --- .github/workflows/pipeline.yml | 2 +- Cargo.lock | 4 ++-- builders/Cargo.toml | 4 ++-- core/Cargo.toml | 2 +- core/src/models/map.rs | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index b869555..c8c494a 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -45,7 +45,7 @@ jobs: ${{ runner.os }}-cargo-build- - name: Build the project - run: cargo build --workspace --all-targets + run: cargo build --workspace --all-targets --features "serde/derive" - name: Run tests run: cargo test --workspace --all-targets diff --git a/Cargo.lock b/Cargo.lock index acdf282..87e66da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,7 +107,7 @@ dependencies = [ [[package]] name = "serverless_workflow_builders" -version = "1.0.0-alpha6.1" +version = "1.0.0-alpha6.2" dependencies = [ "serde_json", "serde_yaml", @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "serverless_workflow_core" -version = "1.0.0-alpha6.1" +version = "1.0.0-alpha6.2" dependencies = [ "serde", "serde_derive", diff --git a/builders/Cargo.toml b/builders/Cargo.toml index d315f47..eba29e9 100644 --- a/builders/Cargo.toml +++ b/builders/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serverless_workflow_builders" -version = "1.0.0-alpha6.1" +version = "1.0.0-alpha6.2" edition = "2021" authors = ["The Serverless Workflow Authors "] description = "Contains services used to build ServerlessWorkflow workflow definitions programatically" @@ -12,6 +12,6 @@ keywords = ["serverless-workflow", "sdk", "builders"] categories = ["config", "parsing", "data-structures", "api-bindings"] [dependencies] -serverless_workflow_core = { path = "../core", version = "1.0.0-alpha6.1" } +serverless_workflow_core = { path = "../core", version = "1.0.0-alpha6.2" } serde_json = "1.0" serde_yaml = "0.9" \ No newline at end of file diff --git a/core/Cargo.toml b/core/Cargo.toml index 8f83379..0d4fb27 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serverless_workflow_core" -version = "1.0.0-alpha6.1" +version = "1.0.0-alpha6.2" edition = "2021" authors = ["The Serverless Workflow Authors "] description = "Contains Serverless Workflow DSL models" diff --git a/core/src/models/map.rs b/core/src/models/map.rs index 44e0d16..ac08657 100644 --- a/core/src/models/map.rs +++ b/core/src/models/map.rs @@ -1,10 +1,9 @@ use serde::{Serialize, Deserialize}; -use serde_derive::{Deserialize, Serialize}; use std::collections::HashMap; use std::hash::Hash; /// Represents an ordered key/value map array -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Clone, PartialEq, serde_derive::Serialize, serde_derive::Deserialize)] #[serde(bound( serialize = "TKey: Serialize, TValue: Serialize", deserialize = "TKey: for<'d> Deserialize<'d> + Eq + Hash + Clone + PartialEq, TValue: for<'d> Deserialize<'d> + Clone + PartialEq"