andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

fix merge conflict in cargo.toml

Browse Source
This commit is contained in:
Sam Vente 2024-09-14 11:47:34 +02:00
parent dadb1a4a20
commit b82036bb3f
No known key found for this signature in database
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
helix-term/Cargo.toml
View File

@ -50,7 +50,7 @@ tokio = { version = "1", features = [
tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = [
"crossterm",
] }
crossterm = { version = "0.27", features = ["event-stream"] }
crossterm = { version = "0.28", features = ["event-stream"] }
signal-hook = "0.3"
tokio-stream = "0.1"
futures-util = { version = "0.3", features = [
@ -69,13 +69,14 @@ log = "0.4"
nucleo.workspace = true
ignore = "0.4"
# markdown doc rendering
pulldown-cmark = { version = "0.11", default-features = false }
pulldown-cmark = { version = "0.12", default-features = false }
# file type detection
content_inspector = "0.2.4"
thiserror = "1.0"
# opening URLs
open = "5.1.3"
url = "2.5.0"
open = "5.3.0"
url = "2.5.2"
# config
toml = "0.8"
@ -84,15 +85,19 @@ serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
# ripgrep for global search
grep-regex = "0.1.12"
grep-searcher = "0.1.13"
grep-regex = "0.1.13"
grep-searcher = "0.1.14"
[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
libc = "0.2.155"
libc = "0.2.158"
[target.'cfg(target_os = "macos")'.dependencies]
crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
crossterm = { version = "0.28", features = [
"event-stream",
"use-dev-tty",
"libc",
] }
[build-dependencies]
helix-loader = { path = "../helix-loader" }
@ -100,4 +105,5 @@ helix-loader = { path = "../helix-loader" }
[dev-dependencies]
smallvec = "1.13"
indoc = "2.0.5"
tempfile = "3.10.1"
tempfile = "3.12.0"
same-file = "1.0.1"