on master help sign in
Update crossterm to 0.26.1
79bf5e3Michael Davis
Cargo.lock+2−2
@@ -261,9 +261,9 @@ dependencies = [
261
261
262[[package]]
262[[package]]
263name = "crossterm"
263name = "crossterm"
264−version = "0.25.0"
264+version = "0.26.1"
265source = "registry+https://github.com/rust-lang/crates.io-index"
265source = "registry+https://github.com/rust-lang/crates.io-index"
266−checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
266+checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
267dependencies = [
267dependencies = [
268 "bitflags",
268 "bitflags",
269 "crossterm_winapi",
269 "crossterm_winapi",
helix-term/Cargo.toml+1−1
@@ -37,7 +37,7 @@ which = "4.4"
37
37
38tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
38tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
39tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
39tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
40−crossterm = { version = "0.25", features = ["event-stream"] }
40+crossterm = { version = "0.26", features = ["event-stream"] }
41signal-hook = "0.3"
41signal-hook = "0.3"
42tokio-stream = "0.1"
42tokio-stream = "0.1"
43futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
43futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
helix-tui/Cargo.toml+1−1
@@ -19,7 +19,7 @@ default = ["crossterm"]
19bitflags = "1.3"
19bitflags = "1.3"
20cassowary = "0.3"
20cassowary = "0.3"
21unicode-segmentation = "1.10"
21unicode-segmentation = "1.10"
22−crossterm = { version = "0.25", optional = true }
22+crossterm = { version = "0.26", optional = true }
23termini = "0.1"
23termini = "0.1"
24serde = { version = "1", "optional" = true, features = ["derive"]}
24serde = { version = "1", "optional" = true, features = ["derive"]}
25helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
25helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
helix-tui/src/backend/crossterm.rs+5−5
@@ -1,6 +1,6 @@
1use crate::{backend::Backend, buffer::Cell};
1use crate::{backend::Backend, buffer::Cell};
2use crossterm::{
2use crossterm::{
3− cursor::{CursorShape, Hide, MoveTo, SetCursorShape, Show},
3+ cursor::{Hide, MoveTo, SetCursorStyle, Show},
4 execute, queue,
4 execute, queue,
5 style::{
5 style::{
6 Attribute as CAttribute, Color as CColor, Print, SetAttribute, SetBackgroundColor,
6 Attribute as CAttribute, Color as CColor, Print, SetAttribute, SetBackgroundColor,
@@ -156,12 +156,12 @@ where
156
156
157 fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
157 fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
158 let shape = match kind {
158 let shape = match kind {
159− CursorKind::Block => CursorShape::Block,
159+ CursorKind::Block => SetCursorStyle::SteadyBlock,
160− CursorKind::Bar => CursorShape::Line,
160+ CursorKind::Bar => SetCursorStyle::SteadyBar,
161− CursorKind::Underline => CursorShape::UnderScore,
161+ CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
162 CursorKind::Hidden => unreachable!(),
162 CursorKind::Hidden => unreachable!(),
163 };
163 };
164− map_error(execute!(self.buffer, Show, SetCursorShape(shape)))
164+ map_error(execute!(self.buffer, Show, shape))
165 }
165 }
166
166
167 fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
167 fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
helix-view/Cargo.toml+1−1
@@ -20,7 +20,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
20helix-loader = { version = "0.6", path = "../helix-loader" }
20helix-loader = { version = "0.6", path = "../helix-loader" }
21helix-lsp = { version = "0.6", path = "../helix-lsp" }
21helix-lsp = { version = "0.6", path = "../helix-lsp" }
22helix-dap = { version = "0.6", path = "../helix-dap" }
22helix-dap = { version = "0.6", path = "../helix-dap" }
23−crossterm = { version = "0.25", optional = true }
23+crossterm = { version = "0.26", optional = true }
24helix-vcs = { version = "0.6", path = "../helix-vcs" }
24helix-vcs = { version = "0.6", path = "../helix-vcs" }
25
25
26# Conversion traits
26# Conversion traits