mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-04-20 05:33:51 +02:00
Code Issues

update MSRV to 1.65

This commit is contained in:
Pascal Kuthe 2023-03-04 21:53:54 +01:00 committed by Blaž Hrastnik
parent 5b4e73f37d
commit ccdb144665
7 changed files with 77 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.63
uses: dtolnay/rust-toolchain@1.65
- uses: Swatinem/rust-cache@v2
@ -66,7 +66,7 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.63
uses: dtolnay/rust-toolchain@1.65
with:
components: rustfmt, clippy
@ -91,7 +91,7 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.63
uses: dtolnay/rust-toolchain@1.65
- uses: Swatinem/rust-cache@v2

236
Cargo.lock generated
View File

@ -61,15 +61,6 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]]
name = "atoi"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
dependencies = [
"num-traits",
]
[[package]]
name = "autocfg"
version = "1.1.0"
@ -107,9 +98,9 @@ dependencies = [
[[package]]
name = "btoi"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97c0869a9faa81f8bbf8102371105d6d0a7b79167a04c340b04ab16892246a11"
checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
dependencies = [
"num-traits",
]
@ -132,27 +123,12 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
[[package]]
name = "bytesize"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70"
[[package]]
name = "cassowary"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
[[package]]
name = "castaway"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
dependencies = [
"rustversion",
]
[[package]]
name = "cc"
version = "1.0.79"
@ -215,17 +191,6 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "compact_str"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5138945395949e7dfba09646dc9e766b548ff48e23deb5246890e6b64ae9e1b9"
dependencies = [
"castaway",
"itoa",
"ryu",
]
[[package]]
name = "content_inspector"
version = "0.2.4"
@ -270,7 +235,7 @@ dependencies = [
"futures-core",
"libc",
"mio",
"parking_lot 0.12.1",
"parking_lot",
"signal-hook",
"signal-hook-mio",
"winapi",
@ -329,19 +294,6 @@ dependencies = [
"syn",
]
[[package]]
name = "dashmap"
version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
dependencies = [
"cfg-if",
"hashbrown 0.12.3",
"lock_api",
"once_cell",
"parking_lot_core 0.9.4",
]
[[package]]
name = "dirs"
version = "4.0.0"
@ -568,9 +520,9 @@ dependencies = [
[[package]]
name = "gix"
version = "0.36.1"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3d5dbcb1efbee862cdc851a23377e1a8a5c1a8971740b4933d4ce022a0889a8"
checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0"
dependencies = [
"gix-actor",
"gix-attributes",
@ -602,7 +554,6 @@ dependencies = [
"gix-worktree",
"log",
"once_cell",
"prodash",
"signal-hook",
"smallvec",
"thiserror",
@ -611,26 +562,25 @@ dependencies = [
[[package]]
name = "gix-actor"
version = "0.17.2"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "381153ea93b9d8a5c6894a5c734b2e9c15d623063adfd2bda4342ecf90f9a5f8"
checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf"
dependencies = [
"bstr 1.3.0",
"btoi",
"gix-date",
"itoa",
"nom",
"quick-error",
"thiserror",
]
[[package]]
name = "gix-attributes"
version = "0.8.3"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df09b20424fd4cee04c43b50df954c4b119c45b769639b60d80ee8bb6d84e0aa"
checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1"
dependencies = [
"bstr 1.3.0",
"compact_str",
"gix-features",
"gix-glob",
"gix-path",
@ -641,11 +591,11 @@ dependencies = [
[[package]]
name = "gix-bitmap"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5229fd26e288f417c8dd2385c5bc740415eb55aba4d6f529db7ad4b526771e06"
checksum = "024bca0c7187517bda5ea24ab148c9ca8208dd0c3e2bea88cdb2008f91791a6d"
dependencies = [
"quick-error",
"thiserror",
]
[[package]]
@ -668,9 +618,9 @@ dependencies = [
[[package]]
name = "gix-config"
version = "0.16.2"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "398b5003d5e4991355528e8fbb4a9d532050c8327df790522735a711db82fcd0"
checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1"
dependencies = [
"bstr 1.3.0",
"gix-config-value",
@ -702,9 +652,9 @@ dependencies = [
[[package]]
name = "gix-credentials"
version = "0.9.2"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1536399f70146825bd10321adc5307032e3de93f4954a3c54184281f2e6955"
checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b"
dependencies = [
"bstr 1.3.0",
"gix-command",
@ -730,9 +680,9 @@ dependencies = [
[[package]]
name = "gix-diff"
version = "0.26.1"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ec3351a6cec2ddca29c1124afef8b4f3fad0b617dce8916148153541468117c"
checksum = "585b0834d4b6791a848637c4e109545fda9b0f29b591ba55edb33ceda6e7856b"
dependencies = [
"gix-hash",
"gix-object",
@ -742,9 +692,9 @@ dependencies = [
[[package]]
name = "gix-discover"
version = "0.13.1"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38029783886cb46fbe63e61b02a70404aa04cfeacfb53ed336832c20fcb1e281"
checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350"
dependencies = [
"bstr 1.3.0",
"dunce",
@ -757,9 +707,9 @@ dependencies = [
[[package]]
name = "gix-features"
version = "0.26.5"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3402b831ea4bb3af36369d61dbf250eb0e1a8577d3cb77b9719c11a82485bfe9"
checksum = "5e6a9dfa7b3c1a99315203e8b97f8f99f3bd95731590607abeaa5ca31bc41fe3"
dependencies = [
"crc32fast",
"flate2",
@ -767,8 +717,8 @@ dependencies = [
"libc",
"once_cell",
"prodash",
"quick-error",
"sha1_smol",
"thiserror",
"walkdir",
]
@ -794,23 +744,24 @@ dependencies = [
[[package]]
name = "gix-hashtable"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a256cceeea0f0d7f42a0c3ac649535644a04395d9f415518f4008ef6bb331b5"
checksum = "9609c1b8f36f12968e6a6098f7cdb52004f7d42d570f47a2d6d7c16612f19acb"
dependencies = [
"gix-hash",
"hashbrown 0.13.2",
"parking_lot",
]
[[package]]
name = "gix-index"
version = "0.12.4"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "decb345476c25434a202f1cf8a24aa71133c567b7b502c549fd57211c51ed78a"
checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616"
dependencies = [
"atoi",
"bitflags",
"bstr 1.3.0",
"btoi",
"filetime",
"gix-bitmap",
"gix-features",
@ -826,31 +777,31 @@ dependencies = [
[[package]]
name = "gix-lock"
version = "3.0.2"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5fe84f09afadec78a7227d80f58cb5412d216dbae4b7fa060b619c0ce62b55d"
checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e"
dependencies = [
"fastrand",
"gix-tempfile",
"quick-error",
"thiserror",
]
[[package]]
name = "gix-mailmap"
version = "0.9.3"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a28214e75835ab33d34210a18981110642728bf169f5e339dbfb6f6380b94318"
checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a"
dependencies = [
"bstr 1.3.0",
"gix-actor",
"quick-error",
"thiserror",
]
[[package]]
name = "gix-object"
version = "0.26.2"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3b04e3028ddab838d005104f234f4d2c26ecd51f2d72d96747c878094c4619"
checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017"
dependencies = [
"bstr 1.3.0",
"btoi",
@ -867,9 +818,9 @@ dependencies = [
[[package]]
name = "gix-odb"
version = "0.40.2"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bd81ab7cd13c0f78bd619f967509953094f415288f8693dbb63a084e5bb39c4"
checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80"
dependencies = [
"arc-swap",
"gix-features",
@ -878,20 +829,18 @@ dependencies = [
"gix-pack",
"gix-path",
"gix-quote",
"parking_lot 0.12.1",
"parking_lot",
"tempfile",
"thiserror",
]
[[package]]
name = "gix-pack"
version = "0.30.3"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26143c5c8bc145a39e9b335cc74504f2eba2ce68b1724661d8e6cb4484ab187e"
checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775"
dependencies = [
"bytesize",
"clru",
"dashmap",
"gix-chunk",
"gix-diff",
"gix-features",
@ -902,7 +851,7 @@ dependencies = [
"gix-tempfile",
"gix-traverse",
"memmap2",
"parking_lot 0.12.1",
"parking_lot",
"smallvec",
"thiserror",
]
@ -926,26 +875,26 @@ dependencies = [
"gix-command",
"gix-config-value",
"nix",
"parking_lot 0.12.1",
"parking_lot",
"thiserror",
]
[[package]]
name = "gix-quote"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e34cffcf5dd0ddf06a768b697a0f29319284deffba970e4355b51b0fee61ffa2"
checksum = "a282f5a8d9ee0b09ec47390ac727350c48f2f5c76d803cd8da6b3e7ad56e0bcb"
dependencies = [
"bstr 1.3.0",
"btoi",
"quick-error",
"thiserror",
]
[[package]]
name = "gix-ref"
version = "0.24.1"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93e85abee11aa093f24da7336bf0a8ad598f15da396b28cf1270ab1091137d35"
checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632"
dependencies = [
"gix-actor",
"gix-features",
@ -962,9 +911,9 @@ dependencies = [
[[package]]
name = "gix-refspec"
version = "0.7.3"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac80b201eeeb3bc554583fd0127cb6bc9e20981cabb085149c9740329f8a2319"
checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65"
dependencies = [
"bstr 1.3.0",
"gix-hash",
@ -976,9 +925,9 @@ dependencies = [
[[package]]
name = "gix-revision"
version = "0.10.4"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "107a10d92379a797bea0f1d0eceded58e08913e0a706c8d436592673c6c6503f"
checksum = "ed98e4a0254953c64bc913bd23146a1de662067d5cf974cbdde396958b39e5b0"
dependencies = [
"bstr 1.3.0",
"gix-date",
@ -1003,13 +952,13 @@ dependencies = [
[[package]]
name = "gix-tempfile"
version = "3.0.2"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48590cb5de0b8feadee42466a90028877ba67b9fd894c5493b4b64f5e3217c17"
checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31"
dependencies = [
"dashmap",
"libc",
"once_cell",
"parking_lot",
"signal-hook",
"signal-hook-registry",
"tempfile",
@ -1017,9 +966,9 @@ dependencies = [
[[package]]
name = "gix-traverse"
version = "0.22.1"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7ee7eee98b6e196fba1f34751d4399e0daa4e61892a78f634d0901e52dd739b"
checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3"
dependencies = [
"gix-hash",
"gix-hashtable",
@ -1029,9 +978,9 @@ dependencies = [
[[package]]
name = "gix-url"
version = "0.13.3"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d6e3e05267f7873099b3e510ab8eebdfc28920a915ab2e3d549493abe0fd9f0"
checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528"
dependencies = [
"bstr 1.3.0",
"gix-features",
@ -1053,9 +1002,9 @@ dependencies = [
[[package]]
name = "gix-worktree"
version = "0.12.3"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da7ddd5b042c85cfe768d5ea97bb204cf1ed2b9413148f482146f4e831ca172e"
checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb"
dependencies = [
"bstr 1.3.0",
"gix-attributes",
@ -1280,7 +1229,7 @@ dependencies = [
"helix-core",
"imara-diff",
"log",
"parking_lot 0.12.1",
"parking_lot",
"tempfile",
"tokio",
]
@ -1339,12 +1288,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "human_format"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86cce260d758a9aa3d7c4b99d55c815a540f8a37514ba6046ab6be402a157cb0"
[[package]]
name = "iana-time-zone"
version = "0.1.53"
@ -1653,17 +1596,6 @@ version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "parking_lot"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api",
"parking_lot_core 0.8.6",
]
[[package]]
name = "parking_lot"
version = "0.12.1"
@ -1671,21 +1603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core 0.9.4",
]
[[package]]
name = "parking_lot_core"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
dependencies = [
"cfg-if",
"instant",
"libc",
"redox_syscall",
"smallvec",
"winapi",
"parking_lot_core",
]
[[package]]
@ -1730,15 +1648,9 @@ dependencies = [
[[package]]
name = "prodash"
version = "23.0.0"
version = "23.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d8c414345b4a98cbcd0e8d8829c8f54b47a7ed4fb771c45b7c5c6c0ae23dc4c"
dependencies = [
"bytesize",
"dashmap",
"human_format",
"parking_lot 0.11.2",
]
checksum = "d73c6b64cb5b99eb63ca97d378685712617ec0172ff5c04cd47a489d3e2c51f8"
[[package]]
name = "pulldown-cmark"
@ -1751,12 +1663,6 @@ dependencies = [
"unicase",
]
[[package]]
name = "quick-error"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quickcheck"
version = "1.0.3"
@ -1860,12 +1766,6 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "rustversion"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
[[package]]
name = "ryu"
version = "1.0.11"
@ -2208,7 +2108,7 @@ dependencies = [
"memchr",
"mio",
"num_cpus",
"parking_lot 0.12.1",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",

2
helix-term/Cargo.toml
View File

@ -10,7 +10,7 @@ repository = "https://github.com/helix-editor/helix"
homepage = "https://helix-editor.com"
include = ["src/**/*", "README.md"]
default-run = "hx"
rust-version = "1.57"
rust-version = "1.65"
[features]
default = ["git"]

5
helix-term/src/commands.rs
View File

@ -3061,10 +3061,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
.prev_hunk(cursor_line)
.map(|idx| idx.saturating_sub(count)),
};
// TODO refactor with let..else once MSRV reaches 1.65
let hunk_idx = if let Some(hunk_idx) = hunk_idx {
hunk_idx
} else {
let Some(hunk_idx) = hunk_idx else {
return range;
};
let hunk = hunks.nth_hunk(hunk_idx);

13
helix-term/src/ui/document.rs
View File

@ -202,10 +202,7 @@ pub fn render_text<'t>(
// formattter.line_pos returns to line index of the next grapheme
// so it must be called before formatter.next
let doc_line = formatter.line_pos();
// TODO refactor with let .. else once MSRV reaches 1.65
let (grapheme, mut pos) = if let Some(it) = formatter.next() {
it
} else {
let Some((grapheme, mut pos)) = formatter.next() else {
let mut last_pos = formatter.visual_pos();
if last_pos.row >= row_off {
last_pos.col -= 1;
@ -226,7 +223,6 @@ pub fn render_text<'t>(
// skip any graphemes on visual lines before the block start
if pos.row < row_off {
if char_pos >= style_span.1 {
// TODO refactor using let..else once MSRV reaches 1.65
style_span = if let Some(style_span) = styles.next() {
style_span
} else {
@ -266,12 +262,7 @@ pub fn render_text<'t>(
// aquire the correct grapheme style
if char_pos >= style_span.1 {
// TODO refactor using let..else once MSRV reaches 1.65
style_span = if let Some(style_span) = styles.next() {
style_span
} else {
(Style::default(), usize::MAX)
}
style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
}
char_pos += grapheme.doc_chars();

2
helix-vcs/Cargo.toml
View File

@ -16,7 +16,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
parking_lot = "0.12"
gix = { version = "0.36.1", default-features = false , optional = true }
gix = { version = "0.39.0", default-features = false , optional = true }
imara-diff = "0.1.5"
log = "0.4"

2
rust-toolchain.toml
View File

@ -1,3 +1,3 @@
[toolchain]
channel = "1.64.0"
channel = "1.65.0"
components = ["rustfmt", "rust-src"]