Skip to content

Commit

Permalink
Make yaml-rust non-optional (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
devkelley authored Oct 13, 2023
1 parent 4095499 commit deb1f1c
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 12 deletions.
4 changes: 1 addition & 3 deletions pub-sub-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
tonic = { workspace = true }
url = { workspace = true }
uuid = { workspace = true, features = [ "v4", "fast-rng", "macro-diagnostics"] }
yaml-rust = { workspace = true, optional = true }
yaml-rust = { workspace = true }

[features]
default = ["yaml"]
yaml = ["yaml-rust"]
containerize = []
2 changes: 0 additions & 2 deletions pub-sub-service/src/load_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

//! Loads configuration from external files.
#![cfg(feature = "yaml")]

use std::env;

use config::{Config, File, FileFormat};
Expand Down
6 changes: 1 addition & 5 deletions samples/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,4 @@ strum = { workspace = true }
strum_macros = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
tonic = { workspace = true }
yaml-rust = { workspace = true, optional = true }

[features]
default = ["yaml"]
yaml = ["yaml-rust"]
yaml-rust = { workspace = true }
2 changes: 0 additions & 2 deletions samples/common/src/load_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

//! Loads configuration from external files.
#![cfg(feature = "yaml")]

use config::{Config, File, FileFormat};
use log::error;
use serde_derive::{Deserialize, Serialize};
Expand Down

0 comments on commit deb1f1c

Please sign in to comment.