summaryrefslogtreecommitdiffstats
path: root/Cargo.lock
diff options
context:
space:
mode:
authorYutaka Kamei <kamei@yykamei.me>2021-04-30 23:35:12 +0900
committerYutaka Kamei <kamei@yykamei.me>2021-05-02 06:18:40 +0900
commit168deabea7825f1b2bf81ec79de9f4bfaab8413e (patch)
treedd413499bb1a77d1af25705217bfab86ce2f18b4 /Cargo.lock
parent69d34c3e093f30df38f3eea30877e0292f3bd785 (diff)
Load config before start()
Previously, a config file was loaded within `start()`, and if the config file is invalid, Zellij was supposed to show a user what's wrong with it. However, since `start()` starts setting up its terminal with an alternative screen buffer, neither standard output nor standard error could display such an error. This change intends to address this issue by making Zellij load a config file before `start()`. In addition, the patch also includes some refactorings: * Redefine `from_cli_config` with `TryFrom`, which was introduced in Rust 1.34 * Remove conditional declaration `cfg(not(test))` because `start()` now receive a `Config` as the third argument * Introduce [`tempfile`](https://crates.io/crates/tempfile) in order to run tests with actual files * Typo?: "Deserialisation" -> "Deserialization"
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock1
1 files changed, 1 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c94f39ae7..55cfcf013 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2205,6 +2205,7 @@ dependencies = [
"strip-ansi-escapes",
"structopt",
"strum",
+ "tempfile",
"termion",
"termios",
"unicode-truncate",