From 4e62b3a1b5f3d35a3e912069dda2f032a59229a5 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 27 May 2021 13:41:17 +0200 Subject: [PATCH] Move `config` assets to `zellij-utils` crate * The assets macro seems to not be able to read across create boundaries. Now the assets are included in the crate they are used in. --- zellij-utils/assets/README.md | 4 ++++ {assets => zellij-utils/assets}/config/default.yaml | 0 zellij-utils/src/setup.rs | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 zellij-utils/assets/README.md rename {assets => zellij-utils/assets}/config/default.yaml (100%) diff --git a/zellij-utils/assets/README.md b/zellij-utils/assets/README.md new file mode 100644 index 00000000..4c4821d1 --- /dev/null +++ b/zellij-utils/assets/README.md @@ -0,0 +1,4 @@ +# Assets for the Utils Crate + +Here reside assets, that are especially needed for +setup eg. a default configuration file. diff --git a/assets/config/default.yaml b/zellij-utils/assets/config/default.yaml similarity index 100% rename from assets/config/default.yaml rename to zellij-utils/assets/config/default.yaml diff --git a/zellij-utils/src/setup.rs b/zellij-utils/src/setup.rs index d7ddefe4..f09ec49e 100644 --- a/zellij-utils/src/setup.rs +++ b/zellij-utils/src/setup.rs @@ -74,7 +74,7 @@ pub fn dump_asset(asset: &[u8]) -> std::io::Result<()> { pub const DEFAULT_CONFIG: &[u8] = include_bytes!(concat!( env!("CARGO_MANIFEST_DIR"), "/", - "../assets/config/default.yaml" + "assets/config/default.yaml" )); pub fn dump_default_config() -> std::io::Result<()> {