From ba206b1f29065d2cdd304809ab37db2963d6ec7d Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 15 May 2021 12:45:24 +0200 Subject: [PATCH] Invert Assets Installation Feature * changed `enable_automatic_asset_installation` to `disable_automatic_asset_installation` This ensures that people by default get the asset installation and need to opt out at compile time, rather than opt in. * removed default features Not needed anymore. --- Cargo.toml | 3 +-- src/common/utils/consts.rs | 4 ++-- src/server/mod.rs | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b2faa935..1acd2c11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,5 +80,4 @@ assets = [ ] [features] -default = [ "enable_automatic_asset_installation", ] -enable_automatic_asset_installation = [] +disable_automatic_asset_installation = [] diff --git a/src/common/utils/consts.rs b/src/common/utils/consts.rs index 479405c3..42843eb8 100644 --- a/src/common/utils/consts.rs +++ b/src/common/utils/consts.rs @@ -49,6 +49,6 @@ lazy_static! { } pub const FEATURES: &[&str] = &[ - #[cfg(feature = "enable_automatic_asset_installation")] - "enable_automatic_asset_installation", + #[cfg(feature = "disable_automatic_asset_installation")] + "disable_automatic_asset_installation", ]; diff --git a/src/server/mod.rs b/src/server/mod.rs index a4a79ca0..3bd38999 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -187,7 +187,7 @@ fn init_session( // Determine and initialize the data directory let data_dir = opts.data_dir.unwrap_or_else(get_default_data_dir); - #[cfg(enable_automatic_assets_installation)] + #[cfg(not(disable_automatic_assets_installation))] populate_data_dir(&data_dir); // Don't use default layouts in tests, but do everywhere else