diff --git a/Cargo.lock b/Cargo.lock index 5d300edf..1362e062 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -417,9 +417,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "getrandom" @@ -1574,8 +1574,8 @@ dependencies = [ [[package]] name = "tengri" -version = "0.1.0" -source = "git+https://codeberg.org/unspeaker/tengri?rev=877b344765#877b3447653f69f951f3bc0dad57de82350d866b" +version = "0.1.1" +source = "git+https://codeberg.org/unspeaker/tengri?rev=9b3c8d4#9b3c8d4ac62c8b5fb750171b77bc1ed34939ddb3" dependencies = [ "tengri_dsl", "tengri_input", @@ -1585,8 +1585,8 @@ dependencies = [ [[package]] name = "tengri_dsl" -version = "0.1.0" -source = "git+https://codeberg.org/unspeaker/tengri?rev=877b344765#877b3447653f69f951f3bc0dad57de82350d866b" +version = "0.1.1" +source = "git+https://codeberg.org/unspeaker/tengri?rev=9b3c8d4#9b3c8d4ac62c8b5fb750171b77bc1ed34939ddb3" dependencies = [ "itertools 0.14.0", "konst", @@ -1595,24 +1595,24 @@ dependencies = [ [[package]] name = "tengri_input" -version = "0.1.0" -source = "git+https://codeberg.org/unspeaker/tengri?rev=877b344765#877b3447653f69f951f3bc0dad57de82350d866b" +version = "0.1.1" +source = "git+https://codeberg.org/unspeaker/tengri?rev=9b3c8d4#9b3c8d4ac62c8b5fb750171b77bc1ed34939ddb3" dependencies = [ "tengri_dsl", ] [[package]] name = "tengri_output" -version = "0.1.0" -source = "git+https://codeberg.org/unspeaker/tengri?rev=877b344765#877b3447653f69f951f3bc0dad57de82350d866b" +version = "0.1.1" +source = "git+https://codeberg.org/unspeaker/tengri?rev=9b3c8d4#9b3c8d4ac62c8b5fb750171b77bc1ed34939ddb3" dependencies = [ "tengri_dsl", ] [[package]] name = "tengri_tui" -version = "0.1.0" -source = "git+https://codeberg.org/unspeaker/tengri?rev=877b344765#877b3447653f69f951f3bc0dad57de82350d866b" +version = "0.1.1" +source = "git+https://codeberg.org/unspeaker/tengri?rev=9b3c8d4#9b3c8d4ac62c8b5fb750171b77bc1ed34939ddb3" dependencies = [ "atomic_float", "better-panic", diff --git a/Cargo.toml b/Cargo.toml index 9e5a81e4..15fa5922 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ lto = false [workspace.dependencies.tengri] git = "https://codeberg.org/unspeaker/tengri" -rev = "877b344765" +rev = "9b3c8d4" features = [ "tui", "dsl" ] [workspace.dependencies] diff --git a/app/src/view/view_layout.rs b/app/src/view/view_layout.rs index 487e3888..aef3776d 100644 --- a/app/src/view/view_layout.rs +++ b/app/src/view/view_layout.rs @@ -55,9 +55,7 @@ where A: Content, B: Content, C: Content { } pub(crate) fn wrap ( - bg: Color, - fg: Color, - content: impl Content + bg: Color, fg: Color, content: impl Content ) -> impl Content { Bsp::e(Tui::fg_bg(bg, Reset, "▐"), Bsp::w(Tui::fg_bg(bg, Reset, "▌"), @@ -65,9 +63,7 @@ pub(crate) fn wrap ( } pub(crate) fn button_2 <'a, K, L> ( - key: K, - label: L, - editing: bool, + key: K, label: L, editing: bool, ) -> impl Content + 'a where K: Content + 'a, L: Content + 'a,