From 583273b6ee67a477a5a4e834d53a3eaa0c773c23 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Fri, 2 Feb 2024 20:39:51 -0700 Subject: [PATCH] Bump alacritty to fix some panics (#7313) Release Notes: - Fixed some panics in the Terminal ([#6835](https://github.com/zed-industries/zed/issues/6835)). --- Cargo.lock | 5 ++--- crates/terminal/Cargo.toml | 3 ++- crates/terminal/src/terminal.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6500eacea5..2604753f71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,9 +103,8 @@ dependencies = [ [[package]] name = "alacritty_terminal" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35229555d7cc7e83392dfc27c96bec560b1076d756184893296cd60125f4a264" +version = "0.20.1-dev" +source = "git+https://github.com/alacritty/alacritty?rev=2d2b894c3b869fadc78fce9d72cb5c8d2b764cac#2d2b894c3b869fadc78fce9d72cb5c8d2b764cac" dependencies = [ "base64 0.21.4", "bitflags 2.4.1", diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml index baad46b261..670510356d 100644 --- a/crates/terminal/Cargo.toml +++ b/crates/terminal/Cargo.toml @@ -11,7 +11,8 @@ doctest = false [dependencies] -alacritty_terminal = "0.21" +# needed for "a few weeks" until alacritty 0.13.2 is out +alacritty_terminal = { git = "https://github.com/alacritty/alacritty", rev = "2d2b894c3b869fadc78fce9d72cb5c8d2b764cac" } anyhow.workspace = true db = { path = "../db" } dirs = "4.0.0" diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs index be8dc9ed01..5bc8d00e52 100644 --- a/crates/terminal/src/terminal.rs +++ b/crates/terminal/src/terminal.rs @@ -364,7 +364,7 @@ impl TerminalBuilder { pty, pty_options.hold, false, - ); + )?; //Kick things off let pty_tx = event_loop.channel();