diff options
| author | har7an <99636919+har7an@users.noreply.github.com> | 2025-10-06 17:11:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-06 17:11:34 +0000 |
| commit | 80de7f462c80dab77f3535981a2428a3fc1ffc11 (patch) | |
| tree | 87b1bc61bbf0661889878609cf5256fd8ac568c3 /default-plugins | |
| parent | New Feature: remote attach to a Zellij session from the terminal (#4460) (diff) | |
| download | sl0ppij-80de7f462c80dab77f3535981a2428a3fc1ffc11.tar.gz sl0ppij-80de7f462c80dab77f3535981a2428a3fc1ffc11.tar.xz sl0ppij-80de7f462c80dab77f3535981a2428a3fc1ffc11.zip | |
build(cargo): Update Rust toolchain to 1.90.0 (#4457)
* build(cargo): Define shared manifest properties workspace-wide
in order to allow workspace members to easily copy their values, rather
than copying the actual values manually between files. Prepare for a
future update of the Rust edition this way by defining the edition in
one central location.
* build(cargo): Share the license between all workspace members
and don't copy the actual license value manually between crates.
* build(cargo): Share the rust edition between workspace members
rather than manually defining the value per crate. There is no
apparent advantage in having different parts of the code use different
rust editions. It only makes the code inconsistent, which is not a goal
worth striving for.
* build(cargo): Share the crate version between workspace members
at least for those workspace members that are versioned in lockstep.
* refactor(session-manager): Migrate to Rust edition 2021
from edition 2018 in order to use a single unified Rust edition across
the entire workspace. Apparently the migration does not involve changes
to the actual code.
* refactor(plugin-manager): Migrate to Rust edition 2021
from edition 2018 in order to use a single unified Rust edition across
the entire workspace. Apparently the migration does not involve changes
to the actual code.
* build(zellij-utils): Remove the obsolete build script
which has contained nothing but comments for two years now. The initial
"workaround" has by now become the proper solution and the original
issue (see <https://github.com/zellij-org/zellij/pull/2711>) has never
been heard of since.
The real motivation for this change is the simple fact that this version
of prost-build pulled in a pretty old version of the `which` crate which
doesn't appear to build with Rust 1.89 (latest stable as of now).
* build(cargo): Update Rust toolchain to 1.89
which is the latest stable toolchain as of writing this and has support
for the 2024 Rust edition, unlike the previously used 1.84.
* fixup! build(zellij-utils): Remove the obsolete build script
* refactor: Make implicitly elided lifetimes explicit
in cases where a functions return type has an actual lifetime that
depends on a non `'static` argument.
* build(cargo): Update Rust toolchain to 1.90.0
which is the latest stable toolchain as of writing this. Compared to
1.89.0 this changes the default linker and should, hence, cut down
iteration times during development significantly.
* ci: Force configured rust toolchain version in release builds
for the tagged release assets. Previously the rust version was
unconditionally overwritten to be `stable` regardless of what
`rust-toolchain.toml` configured.
* docs(changelog): Add MR #4457
to list of unreleased changes.
* build: Read package version from workspace version value
since it no longer resides directly in the `package` object.
Diffstat (limited to 'default-plugins')
20 files changed, 34 insertions, 31 deletions
diff --git a/default-plugins/about/Cargo.toml b/default-plugins/about/Cargo.toml index 536617d6..e31b377c 100644 --- a/default-plugins/about/Cargo.toml +++ b/default-plugins/about/Cargo.toml @@ -2,8 +2,8 @@ name = "about" version = "0.1.0" authors = ["Aram Drevekenin <aram@poor.dev>"] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] zellij-tile = { path = "../../zellij-tile" } diff --git a/default-plugins/compact-bar/Cargo.toml b/default-plugins/compact-bar/Cargo.toml index 6f45e2c4..1a3fbbe3 100644 --- a/default-plugins/compact-bar/Cargo.toml +++ b/default-plugins/compact-bar/Cargo.toml @@ -2,8 +2,8 @@ name = "compact-bar" version = "0.1.0" authors = ["Alexander Kenji Berthold <aks.kenji@protonmail.com>" ] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] colored = "2" diff --git a/default-plugins/compact-bar/src/tab.rs b/default-plugins/compact-bar/src/tab.rs index 06517c1c..4ed63e69 100644 --- a/default-plugins/compact-bar/src/tab.rs +++ b/default-plugins/compact-bar/src/tab.rs @@ -4,7 +4,10 @@ use unicode_width::UnicodeWidthStr; use zellij_tile::prelude::*; use zellij_tile_utils::style; -fn cursors(focused_clients: &[ClientId], colors: MultiplayerColors) -> (Vec<ANSIString>, usize) { +fn cursors<'a>( + focused_clients: &'a [ClientId], + colors: MultiplayerColors, +) -> (Vec<ANSIString<'a>>, usize) { // cursor section, text length let mut len = 0; let mut cursors = vec![]; diff --git a/default-plugins/configuration/Cargo.toml b/default-plugins/configuration/Cargo.toml index 52242f3d..a8154f25 100644 --- a/default-plugins/configuration/Cargo.toml +++ b/default-plugins/configuration/Cargo.toml @@ -2,8 +2,8 @@ name = "configuration" version = "0.1.0" authors = ["Aram Drevekenin <aram@poor.dev>"] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] ansi_term = "0.12.1" diff --git a/default-plugins/fixture-plugin-for-tests/Cargo.toml b/default-plugins/fixture-plugin-for-tests/Cargo.toml index 39211c34..5bbf5f30 100644 --- a/default-plugins/fixture-plugin-for-tests/Cargo.toml +++ b/default-plugins/fixture-plugin-for-tests/Cargo.toml @@ -2,8 +2,8 @@ name = "fixture-plugin-for-tests" version = "0.1.0" authors = ["Aram Drevekenin <aram@poor.dev>"] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] serde = { version = "1.0", features = ["derive"] } diff --git a/default-plugins/multiple-select/Cargo.toml b/default-plugins/multiple-select/Cargo.toml index c5580ad4..e29fa22f 100644 --- a/default-plugins/multiple-select/Cargo.toml +++ b/default-plugins/multiple-select/Cargo.toml @@ -2,8 +2,8 @@ name = "multiple-select" version = "0.1.0" authors = ["Aram Drevekenin <aram@poor.dev>"] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] zellij-tile = { path = "../../zellij-tile" } diff --git a/default-plugins/plugin-manager/Cargo.toml b/default-plugins/plugin-manager/Cargo.toml index 71ef3626..0bf5700a 100644 --- a/default-plugins/plugin-manager/Cargo.toml +++ b/default-plugins/plugin-manager/Cargo.toml @@ -2,7 +2,7 @@ name = "plugin-manager" version = "0.1.0" authors = ["Aram Drevekenin <aram@poor.dev>"] -edition = "2018" +edition.workspace = true [dependencies] uuid = { version = "1.7.0", features = ["v4"] } diff --git a/default-plugins/session-manager/Cargo.toml b/default-plugins/session-manager/Cargo.toml index deb8cec5..064ff365 100644 --- a/default-plugins/session-manager/Cargo.toml +++ b/default-plugins/session-manager/Cargo.toml @@ -2,7 +2,7 @@ name = "session-manager" version = "0.1.0" authors = ["Aram Drevekenin <aram@poor.dev>"] -edition = "2018" +edition.workspace = true [dependencies] ansi_term = "0.12.1" diff --git a/default-plugins/share/Cargo.toml b/default-plugins/share/Cargo.toml index e89b623c..4a2db699 100644 --- a/default-plugins/share/Cargo.toml +++ b/default-plugins/share/Cargo.toml @@ -2,8 +2,8 @@ name = "share" version = "0.1.0" authors = ["Aram Drevekenin <aram@poor.dev>"] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] zellij-tile = { path = "../../zellij-tile" } diff --git a/default-plugins/share/src/main_screen.rs b/default-plugins/share/src/main_screen.rs index 2cd300cb..5c3ec7d7 100644 --- a/default-plugins/share/src/main_screen.rs +++ b/default-plugins/share/src/main_screen.rs @@ -80,7 +80,7 @@ impl<'a> MainScreen<'a> { state } - fn calculate_layout(&self, rows: usize, cols: usize) -> Layout { + fn calculate_layout<'b>(&'b self, rows: usize, cols: usize) -> Layout<'b> { let usage = Usage::new(!self.token_list_is_empty); let web_server_status_section = WebServerStatusSection::new( self.web_server_started, diff --git a/default-plugins/status-bar/Cargo.toml b/default-plugins/status-bar/Cargo.toml index c1492c19..ad6fa2d4 100644 --- a/default-plugins/status-bar/Cargo.toml +++ b/default-plugins/status-bar/Cargo.toml @@ -2,8 +2,8 @@ name = "status-bar" version = "0.1.0" authors = ["Brooks J Rady <b.j.rady@gmail.com>"] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] colored = "2" diff --git a/default-plugins/status-bar/src/tip/data/compact_layout.rs b/default-plugins/status-bar/src/tip/data/compact_layout.rs index e8ee5e16..14881174 100644 --- a/default-plugins/status-bar/src/tip/data/compact_layout.rs +++ b/default-plugins/status-bar/src/tip/data/compact_layout.rs @@ -75,7 +75,7 @@ pub fn compact_layout_short(help: &ModeInfo) -> LinePart { strings!(&bits) } -fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> { +fn add_keybinds<'a>(help: &'a ModeInfo) -> Vec<ANSIString<'a>> { let to_pane = action_key( &help.get_mode_keybinds(), &[Action::SwitchToMode { diff --git a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs index cbc38f28..2d858889 100644 --- a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs +++ b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs @@ -65,7 +65,7 @@ pub fn edit_scrollbuffer_short(help: &ModeInfo) -> LinePart { strings!(&bits) } -fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> { +fn add_keybinds<'a>(help: &'a ModeInfo) -> Vec<ANSIString<'a>> { let to_pane = action_key( &help.get_mode_keybinds(), &[Action::SwitchToMode { diff --git a/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs b/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs index 8e20a49c..24124be6 100644 --- a/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs +++ b/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs @@ -44,7 +44,7 @@ pub fn floating_panes_mouse_short(help: &ModeInfo) -> LinePart { strings!(&bits) } -fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> { +fn add_keybinds<'a>(help: &'a ModeInfo) -> Vec<ANSIString<'a>> { let to_pane = action_key( &help.get_mode_keybinds(), &[Action::SwitchToMode { diff --git a/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs b/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs index 5afcc6ec..5815a638 100644 --- a/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs +++ b/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs @@ -45,7 +45,7 @@ pub fn move_focus_hjkl_tab_switch_short(help: &ModeInfo) -> LinePart { strings!(&bits) } -fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> { +fn add_keybinds<'a>(help: &'a ModeInfo) -> Vec<ANSIString<'a>> { let pane_keymap = help.get_keybinds_for_mode(InputMode::Pane); let move_focus_keys = action_key_group( &pane_keymap, diff --git a/default-plugins/status-bar/src/tip/data/quicknav.rs b/default-plugins/status-bar/src/tip/data/quicknav.rs index a33afc18..36741742 100644 --- a/default-plugins/status-bar/src/tip/data/quicknav.rs +++ b/default-plugins/status-bar/src/tip/data/quicknav.rs @@ -60,7 +60,7 @@ struct Keygroups<'a> { resize: Vec<ANSIString<'a>>, } -fn add_keybinds(help: &ModeInfo) -> Keygroups { +fn add_keybinds<'a>(help: &'a ModeInfo) -> Keygroups<'a> { let normal_keymap = help.get_mode_keybinds(); let new_pane_keys = action_key( &normal_keymap, diff --git a/default-plugins/status-bar/src/tip/data/sync_tab.rs b/default-plugins/status-bar/src/tip/data/sync_tab.rs index b319ee0b..2413a69d 100644 --- a/default-plugins/status-bar/src/tip/data/sync_tab.rs +++ b/default-plugins/status-bar/src/tip/data/sync_tab.rs @@ -43,7 +43,7 @@ pub fn sync_tab_short(help: &ModeInfo) -> LinePart { strings!(&bits) } -fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> { +fn add_keybinds<'a>(help: &'a ModeInfo) -> Vec<ANSIString<'a>> { let to_tab = action_key( &help.get_mode_keybinds(), &[Action::SwitchToMode { diff --git a/default-plugins/strider/Cargo.toml b/default-plugins/strider/Cargo.toml index 33cf4ca5..153c75af 100644 --- a/default-plugins/strider/Cargo.toml +++ b/default-plugins/strider/Cargo.toml @@ -2,9 +2,9 @@ name = "strider" version = "0.2.0" authors = ["Brooks J Rady <b.j.rady@gmail.com>"] -edition = "2021" +edition.workspace = true description = "A simplified ranger clone written as a Zellij plugin" -license = "MIT" +license.workspace = true [dependencies] colored = "2.0.0" diff --git a/default-plugins/tab-bar/Cargo.toml b/default-plugins/tab-bar/Cargo.toml index 9911a499..3288253a 100644 --- a/default-plugins/tab-bar/Cargo.toml +++ b/default-plugins/tab-bar/Cargo.toml @@ -2,8 +2,8 @@ name = "tab-bar" version = "0.1.0" authors = ["Jonah Caplan <jonahcaplan@gmail.com>"] -edition = "2021" -license = "MIT" +edition.workspace = true +license.workspace = true [dependencies] colored = "2" diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs index 312db5a4..d3eca295 100644 --- a/default-plugins/tab-bar/src/tab.rs +++ b/default-plugins/tab-bar/src/tab.rs @@ -4,10 +4,10 @@ use unicode_width::UnicodeWidthStr; use zellij_tile::prelude::*; use zellij_tile_utils::style; -fn cursors( - focused_clients: &[ClientId], +fn cursors<'a>( + focused_clients: &'a [ClientId], multiplayer_colors: MultiplayerColors, -) -> (Vec<ANSIString>, usize) { +) -> (Vec<ANSIString<'a>>, usize) { // cursor section, text length let mut len = 0; let mut cursors = vec![]; |
