zellij-org · har7an · Oct 6, 2025 · Aug 9, 2025 · Aug 9, 2025 · Aug 9, 2025
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,19 +38,15 @@ jobs:
         include:
           - build: linux musl x64
             os: ubuntu-latest
-            rust: stable
             target: x86_64-unknown-linux-musl
           - build: linux musl aarch64
             os: ubuntu-latest
-            rust: stable
             target: aarch64-unknown-linux-musl
           - build: macos x64
             os: macos-latest
-            rust: stable
             target: x86_64-apple-darwin
           - build: macos aarch64
             os: macos-latest
-            rust: stable
             target: aarch64-apple-darwin
     steps:
       - name: Set release tag
@@ -76,7 +72,6 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: ${{ matrix.rust }}
           target: "${{ matrix.target }},wasm32-wasip1"
           cache: false
           rustflags: ""
@@ -138,19 +133,15 @@ jobs:
         include:
           - build: linux musl x64
             os: ubuntu-latest
-            rust: stable
             target: x86_64-unknown-linux-musl
           - build: linux musl aarch64
             os: ubuntu-latest
-            rust: stable
             target: aarch64-unknown-linux-musl
           - build: macos x64
             os: macos-latest
-            rust: stable
             target: x86_64-apple-darwin
           - build: macos aarch64
             os: macos-latest
-            rust: stable
             target: aarch64-apple-darwin
     steps:
       - name: Set release tag
@@ -176,7 +167,6 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: ${{ matrix.rust }}
           target: "${{ matrix.target }},wasm32-wasip1"
           cache: false
           rustflags: ""

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * fix: occasional status-bar pop-out after resurrecting a session (https://github.com/zellij-org/zellij/pull/4440)
 * fix: properly serialize/resurrect layouts with one-line split panes (https://github.com/zellij-org/zellij/pull/4442)
 * feat: allow attaching to remote Zellij sessions over https (eg. `zellij attach https://example.com/my-cool-session`) (https://github.com/zellij-org/zellij/pull/4460)
+* build: Update Rust toolchain to 1.90.0 (https://github.com/zellij-org/zellij/pull/4457)
 
 ## [0.43.1] - 2025-08-08
 * fix: pane rename backspace regression (https://github.com/zellij-org/zellij/pull/4346)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "zellij"
-version = "0.44.0"
 authors = ["Aram Drevekenin <aram@poor.dev>"]
-edition = "2021"
 description = "A terminal workspace with batteries included"
-license = "MIT"
-repository = "https://github.com/zellij-org/zellij"
 homepage = "https://zellij.dev"
 include = ["src/**/*", "assets/layouts/*", "assets/config/*", "LICENSE.md", "README.md", "!**/*_test.*", "!**/tests/**/*"]
-# NOTE: When updating this, modify `channel` in `rust-toolchain.toml` accordingly
-rust-version = "1.84"
+# See 'workspace.package' for concrete values
+license.workspace = true
+repository.workspace = true
+edition.workspace = true
+version.workspace = true
+rust-version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -59,6 +59,14 @@ members = [
     ".",
 ]
 
+[workspace.package]
+edition = "2021"
+license = "MIT"
+repository = "https://github.com/zellij-org/zellij"
+version = "0.44.0"
+# NOTE: When updating this, modify `channel` in `rust-toolchain.toml` accordingly
+rust-version = "1.90"
+
 [workspace.dependencies]
 ansi_term = { version = "0.12.1", default-features = false }
 anyhow = { version = "1.0.70", default-features = false, features = ["backtrace", "std"] }

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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![];

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,7 +1,7 @@
 # This file is updated by `update-toolchain.sh`
 [toolchain]
 # NOTE: When updating this, modify `rust-version` in `Cargo.toml` accordingly
-channel = "1.84.0"
+channel = "1.90.0"
 components = ["rustfmt", "clippy"]
 # NOTE: Change this with care, this is also used by the CI pipeline
 targets = ["wasm32-wasip1", "x86_64-unknown-linux-musl"]
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "xtask"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 
 [dependencies]

diff --git a/xtask/src/pipelines.rs b/xtask/src/pipelines.rs
@@ -278,8 +278,10 @@ pub fn publish(sh: &Shell, flags: flags::Publish) -> anyhow::Result<()> {
         .context(err_context)?;
     // Version of the core crate
     let version = manifest
-        .get("package")
+        .get("workspace")
+        .and_then(|workspace| workspace.get("package"))
         .and_then(|package| package["version"].as_str())
+        .context("failed to read package version from manifest")
         .context(err_context)?;
 
     let mut skip_build = false;

diff --git a/zellij-client/Cargo.toml b/zellij-client/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "zellij-client"
-version = "0.44.0"
+version.workspace = true
 authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
-edition = "2021"
+edition.workspace = true
 description = "The client-side library for Zellij"
-license = "MIT"
+license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html