diff options
author | Aram Drevekenin <aram@poor.dev> | 2022-10-05 07:44:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-05 07:44:00 +0200 |
commit | 79bf6ab868cbdab1f9a3827c9b70198f54548b44 (patch) | |
tree | 2d6fc4c1d8a79ebd727a1a5f8b6406617dd0de55 /Cargo.lock | |
parent | 917e9b2ff0f583183c0155060d243afd295770b9 (diff) |
feat(config): switch to kdl (#1759)
* chore(config): default kdl keybindings config
* tests
* work
* refactor(config): move stuff around
* work
* tab merge layout
* work
* work
* layouts working
* work
* layout tests
* work
* work
* feat(parsing): kdl layouts without config
* refactor(kdl): move stuff around
* work
* tests(layout): add cases and fix bugs
* work
* fix(kdl): various bugs
* chore(layouts): move all layouts to kdl
* feat(kdl): shared keybidns
* fix(layout): do not count fixed panes toward percentile
* fix(keybinds): missing keybinds and actions
* fix(config): adjust default tips
* refactor(config): move stuff around
* fix(tests): make e2e tests pass
* fix(kdl): add verbose parsing errors
* fix(kdl): focused tab
* fix(layout): corret default_tab_template behavior
* style(code): fix compile warnings
* feat(cli): send actions through the cli
* fix(cli): exit only when action is done
* fix(cli): open embedded pane from floating pane
* fix(cli): send actions to other sessions
* feat(cli): command alias
* feat(converter): convert old config
* feat(converter): convert old layout and theme files
* feat(kdl): pretty errors
* feat(client): convert old YAML files on startup
* fix: various bugs and styling issues
* fix: e2e tests
* fix(screen): propagate errors after merge
* style(clippy): lower clippy level
* fix(tests): own session_name variable
* style(fmt): rustfmt
* fix(cli): various action fixes
* style(fmt): rustfmt
* fix(themes): loading of theme files
* style(fmt): rustfmt
* fix(tests): theme fixtures
* fix(layouts): better errors on unknown nodes
* fix(kdl): clarify valid node terminator error
* fix(e2e): adjust close tab test
* fix(e2e): adjust close tab test again
* style(code): cleanup some comments
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 65 |
1 files changed, 60 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 8130b6aa8..ad8705d62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1226,6 +1226,17 @@ dependencies = [ ] [[package]] +name = "kdl" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8388a371e0e2ede18bbd94e476fcd45b4ac65cefcedf0c06fd13bd8389574a6" +dependencies = [ + "miette 5.3.0", + "nom 7.1.1", + "thiserror", +] + +[[package]] name = "kv-log-macro" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1412,7 +1423,7 @@ checksum = "cd2adcfcced5d625bf90a958a82ae5b93231f57f3df1383fee28c9b5096d35ed" dependencies = [ "atty", "backtrace", - "miette-derive", + "miette-derive 3.3.0", "once_cell", "owo-colors", "supports-color", @@ -1424,6 +1435,18 @@ dependencies = [ ] [[package]] +name = "miette" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28d6092d7e94a90bb9ea8e6c26c99d5d112d49dda2afdb4f7ea8cf09e1a5a6d" +dependencies = [ + "miette-derive 5.3.0", + "once_cell", + "thiserror", + "unicode-width", +] + +[[package]] name = "miette-derive" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1435,6 +1458,23 @@ dependencies = [ ] [[package]] +name = "miette-derive" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2485ed7d1fe80704928e3eb86387439609bd0c6bb96db8208daa364cfd1e09" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] name = "miniz_oxide" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1504,6 +1544,16 @@ dependencies = [ ] [[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] name = "ntapi" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2501,7 +2551,7 @@ checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" dependencies = [ "dirs", "fnv", - "nom", + "nom 5.1.2", "phf", "phf_codegen", ] @@ -3312,11 +3362,12 @@ dependencies = [ "dialoguer", "insta", "log", - "miette", + "miette 3.3.0", "names", "rand 0.8.5", "ssh2", "suggest", + "thiserror", "zellij-client", "zellij-server", "zellij-utils", @@ -3329,6 +3380,9 @@ dependencies = [ "insta", "log", "mio", + "serde", + "serde_yaml", + "url", "zellij-utils", ] @@ -3393,19 +3447,20 @@ dependencies = [ "colorsys", "crossbeam", "directories-next", + "insta", "interprocess", + "kdl", "lazy_static", "libc", "log", "log4rs", - "miette", + "miette 3.3.0", "nix", "once_cell", "regex", "rmp-serde", "serde", "serde_json", - "serde_yaml", "signal-hook 0.3.14", "strip-ansi-escapes", "strum", |