zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-11-30 09:55:29 +03:00
Code Issues Projects Releases Wiki Activity

Invert Assets Installation Feature

Browse Source 
* 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.
This commit is contained in:
a-kenji 2021-05-15 12:45:24 +02:00
parent f1bff237a4
commit ba206b1f29
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -80,5 +80,4 @@ assets = [
] ]
[features] [features]
default = [ "enable_automatic_asset_installation", ] disable_automatic_asset_installation = []
enable_automatic_asset_installation = []

4
src/common/utils/consts.rs
View File

@ -49,6 +49,6 @@ lazy_static! {
} }
pub const FEATURES: &[&str] = &[ pub const FEATURES: &[&str] = &[
#[cfg(feature = "enable_automatic_asset_installation")] #[cfg(feature = "disable_automatic_asset_installation")]
"enable_automatic_asset_installation", "disable_automatic_asset_installation",
]; ];

2
src/server/mod.rs
View File

@ -187,7 +187,7 @@ fn init_session(
// Determine and initialize the data directory // Determine and initialize the data directory
let data_dir = opts.data_dir.unwrap_or_else(get_default_data_dir); 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); populate_data_dir(&data_dir);
// Don't use default layouts in tests, but do everywhere else // Don't use default layouts in tests, but do everywhere else