aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Davis2023-01-11 02:48:26 +0000
committerBlaž Hrastnik2023-02-28 03:35:52 +0000
commit79bf5e3094e16a34637703b14c7bf090d2dcf155 (patch)
treee21867b85eb4ffaad4ffa749222034c8a69e8c12
parenta976786a4fa013150ec1b59ae55276361e61340f (diff)
Update crossterm to 0.26.1
Crossterm 0.26.x includes a breaking change for the command to set the cursor shape. This commit includes a change which uses the new type.
-rw-r--r--Cargo.lock4
-rw-r--r--helix-term/Cargo.toml2
-rw-r--r--helix-tui/Cargo.toml2
-rw-r--r--helix-tui/src/backend/crossterm.rs10
-rw-r--r--helix-view/Cargo.toml2
5 files changed, 10 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock
index cb3300a3..c74e8e40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -261,9 +261,9 @@ dependencies = [
[[package]]
name = "crossterm"
-version = "0.25.0"
+version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
dependencies = [
"bitflags",
"crossterm_winapi",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 4921db92..975d0871 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -37,7 +37,7 @@ which = "4.4"
tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
-crossterm = { version = "0.25", features = ["event-stream"] }
+crossterm = { version = "0.26", features = ["event-stream"] }
signal-hook = "0.3"
tokio-stream = "0.1"
futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index a4a1c389..ccd016f5 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -19,7 +19,7 @@ default = ["crossterm"]
bitflags = "1.3"
cassowary = "0.3"
unicode-segmentation = "1.10"
-crossterm = { version = "0.25", optional = true }
+crossterm = { version = "0.26", optional = true }
termini = "0.1"
serde = { version = "1", "optional" = true, features = ["derive"]}
helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index c00e1f40..5305640c 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -1,6 +1,6 @@
use crate::{backend::Backend, buffer::Cell};
use crossterm::{
- cursor::{CursorShape, Hide, MoveTo, SetCursorShape, Show},
+ cursor::{Hide, MoveTo, SetCursorStyle, Show},
execute, queue,
style::{
Attribute as CAttribute, Color as CColor, Print, SetAttribute, SetBackgroundColor,
@@ -156,12 +156,12 @@ where
fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
let shape = match kind {
- CursorKind::Block => CursorShape::Block,
- CursorKind::Bar => CursorShape::Line,
- CursorKind::Underline => CursorShape::UnderScore,
+ CursorKind::Block => SetCursorStyle::SteadyBlock,
+ CursorKind::Bar => SetCursorStyle::SteadyBar,
+ CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
CursorKind::Hidden => unreachable!(),
};
- map_error(execute!(self.buffer, Show, SetCursorShape(shape)))
+ map_error(execute!(self.buffer, Show, shape))
}
fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 17e07e9a..54b679ad 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -20,7 +20,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
helix-loader = { version = "0.6", path = "../helix-loader" }
helix-lsp = { version = "0.6", path = "../helix-lsp" }
helix-dap = { version = "0.6", path = "../helix-dap" }
-crossterm = { version = "0.25", optional = true }
+crossterm = { version = "0.26", optional = true }
helix-vcs = { version = "0.6", path = "../helix-vcs" }
# Conversion traits