From 7b1c2d79c340dc035eae8b5db910bd283b60a948 Mon Sep 17 00:00:00 2001 From: Devin Kelley <105753233+devkelley@users.noreply.github.com> Date: Fri, 6 Oct 2023 16:20:28 -0700 Subject: [PATCH] Made yaml-rust non-optional and managed_subscribe non-default --- core/invehicle-digital-twin/Cargo.toml | 4 +--- .../src/invehicle_digital_twin_config.rs | 2 -- samples/common/Cargo.toml | 6 +----- samples/common/src/consumer_config.rs | 2 -- samples/common/src/provider_config.rs | 2 -- 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/core/invehicle-digital-twin/Cargo.toml b/core/invehicle-digital-twin/Cargo.toml index 75134381..9f1fb062 100644 --- a/core/invehicle-digital-twin/Cargo.toml +++ b/core/invehicle-digital-twin/Cargo.toml @@ -31,12 +31,10 @@ tokio = { workspace = true , features = ["macros", "rt-multi-thread"] } tonic = { workspace = true } tower = { workspace = true } url = { workspace = true } -yaml-rust = { workspace = true, optional = true } +yaml-rust = { workspace = true } [build-dependencies] tonic-build = { workspace = true } [features] -default = ["managed_subscribe", "yaml"] managed_subscribe = ["dep:managed_subscribe"] -yaml = ["yaml-rust"] \ No newline at end of file diff --git a/core/invehicle-digital-twin/src/invehicle_digital_twin_config.rs b/core/invehicle-digital-twin/src/invehicle_digital_twin_config.rs index ccf5f522..53d4e24a 100644 --- a/core/invehicle-digital-twin/src/invehicle_digital_twin_config.rs +++ b/core/invehicle-digital-twin/src/invehicle_digital_twin_config.rs @@ -2,8 +2,6 @@ // Licensed under the MIT license. // SPDX-License-Identifier: MIT -#![cfg(feature = "yaml")] - use config::{Config, File, FileFormat}; use serde_derive::Deserialize; diff --git a/samples/common/Cargo.toml b/samples/common/Cargo.toml index fb69f10e..32bcda56 100644 --- a/samples/common/Cargo.toml +++ b/samples/common/Cargo.toml @@ -16,8 +16,4 @@ serde = { workspace = true, features = ["derive"] } serde_derive = { workspace = true } tokio = { workspace = true } tonic = { workspace = true } -yaml-rust = { workspace = true, optional = true } - -[features] -default = ["yaml"] -yaml = ["yaml-rust"] +yaml-rust = { workspace = true } diff --git a/samples/common/src/consumer_config.rs b/samples/common/src/consumer_config.rs index 551d14c2..dbe81230 100644 --- a/samples/common/src/consumer_config.rs +++ b/samples/common/src/consumer_config.rs @@ -2,8 +2,6 @@ // Licensed under the MIT license. // SPDX-License-Identifier: MIT -#![cfg(feature = "yaml")] - use config::{Config, File, FileFormat}; use serde_derive::Deserialize; diff --git a/samples/common/src/provider_config.rs b/samples/common/src/provider_config.rs index 40981e10..c223f105 100644 --- a/samples/common/src/provider_config.rs +++ b/samples/common/src/provider_config.rs @@ -2,8 +2,6 @@ // Licensed under the MIT license. // SPDX-License-Identifier: MIT -#![cfg(feature = "yaml")] - use config::{Config, File, FileFormat}; use serde_derive::Deserialize;