Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Alacritty from crates.io (#25016)

Browse source 
Follow-up of https://github.com/zed-industries/zed/pull/23085

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2025-02-17 14:55:06 +02:00 • committed by GitHub
parent b5d85b638a
commit aca31cfb8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Cargo.lock generated
View file

@ -83,8 +83,9 @@ dependencies = [
[[package]] [[package]]
name = "alacritty_terminal" name = "alacritty_terminal"
version = "0.25.0-dev" version = "0.25.0"
source = "git+https://github.com/alacritty/alacritty.git?rev=5e78d20c709cb1ab8d44ca7a8702cc26d779227c#5e78d20c709cb1ab8d44ca7a8702cc26d779227c" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bccc2e60c2112dc8e8a722d6d30f2bb1a6a7b5d0e65fa695e09e57415dca7f7"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"bitflags 2.8.0", "bitflags 2.8.0",
@ -14852,15 +14853,26 @@ dependencies = [
[[package]] [[package]]
name = "vte" name = "vte"
version = "0.14.1" version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077" checksum = "9a0b683b20ef64071ff03745b14391751f6beab06a54347885459b77a3f2caa5"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"cursor-icon", "cursor-icon",
"log", "log",
"memchr",
"serde", "serde",
"utf8parse",
"vte_generate_state_changes",
]
[[package]]
name = "vte_generate_state_changes"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
dependencies = [
"proc-macro2",
"quote",
] ]
[[package]] [[package]]

3
Cargo.toml
View file

@ -364,8 +364,7 @@ zeta = { path = "crates/zeta" }
# #
aho-corasick = "1.1" aho-corasick = "1.1"
# TODO(#18342): Update to version 0.25 from crates.io when it is released. alacritty_terminal = "0.25"
alacritty_terminal = { git = "https://github.com/alacritty/alacritty.git", rev = "5e78d20c709cb1ab8d44ca7a8702cc26d779227c" }
any_vec = "0.14" any_vec = "0.14"
anyhow = "1.0.86" anyhow = "1.0.86"
arrayvec = { version = "0.7.4", features = ["serde"] } arrayvec = { version = "0.7.4", features = ["serde"] }

6
crates/repl/src/outputs/plain.rs
View file

@ -181,10 +181,10 @@ impl TerminalOutput {
for byte in text.as_bytes() { for byte in text.as_bytes() {
if *byte == b'\n' { if *byte == b'\n' {
// Dirty (?) hack to move the cursor down // Dirty (?) hack to move the cursor down
self.parser.advance(&mut self.handler, &[b'\r']); self.parser.advance(&mut self.handler, b'\r');
self.parser.advance(&mut self.handler, &[b'\n']); self.parser.advance(&mut self.handler, b'\n');
} else { } else {
self.parser.advance(&mut self.handler, &[*byte]); self.parser.advance(&mut self.handler, *byte);
} }
} }