Skip to content

Commit 3bd22a7

Browse files
chore(msrv): bump from 1.82 to 1.87 (#15196)
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
1 parent 71f20cf commit 3bd22a7

File tree

9 files changed

+26
-39
lines changed

9 files changed

+26
-39
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ updates:
1212
update-types:
1313
- "minor"
1414
- "patch"
15-
ignore:
16-
# MSRV: these deps use edition 2024 in their newest versions.
17-
# Once the MSRV reaches 1.85 these can be updated and unignored.
18-
- dependency-name: ignore
19-
- dependency-name: globset
20-
- dependency-name: grep-matcher
21-
# Now requires Rust 1.87:
22-
- dependency-name: etcetera
2315

2416
- package-ecosystem: "github-actions"
2517
directory: "/"

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- cron: "00 01 * * *"
1010

1111
env:
12-
MSRV: "1.82"
12+
MSRV: "1.87"
1313
# This key can be changed to bust the cache of tree-sitter grammars.
1414
GRAMMAR_CACHE_VERSION: ""
1515

Cargo.lock

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ tokio-stream = "0.1.18"
5454
toml = "0.9"
5555
termina = "0.1"
5656
sonic-rs = "0.5"
57-
# MSRV: update once the MSRV is >=1.85
58-
globset = "=0.4.16"
57+
globset = "0.4"
58+
etcetera = "0.11"
5959

6060
[workspace.package]
6161
version = "25.7.1"
@@ -65,4 +65,4 @@ categories = ["editor"]
6565
repository = "https://github.com/helix-editor/helix"
6666
homepage = "https://helix-editor.com"
6767
license = "MPL-2.0"
68-
rust-version = "1.82"
68+
rust-version = "1.87"

helix-core/src/test.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,7 @@ mod test {
286286
#[test]
287287
fn print_multi_code_point_grapheme() {
288288
assert_eq!(
289-
(
290-
String::from("hello 👨‍👩‍👧‍👦 goodbye"),
291-
Selection::single(13, 6)
292-
),
289+
(String::from("hello 👨‍👩‍👧‍👦 goodbye"), Selection::single(13, 6)),
293290
print("hello #[|👨‍👩‍👧‍👦]# goodbye")
294291
);
295292
}

helix-loader/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ helix-stdx = { path = "../helix-stdx" }
2020
anyhow = "1"
2121
serde = { version = "1.0", features = ["derive"] }
2222
toml.workspace = true
23-
etcetera = "0.10"
23+
etcetera.workspace = true
2424
once_cell = "1.21"
2525
log = "0.4"
2626

helix-stdx/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ homepage.workspace = true
1313

1414
[dependencies]
1515
dunce = "1.0"
16-
etcetera = "0.10"
16+
etcetera.workspace = true
1717
ropey.workspace = true
1818
which = "8.0"
1919
regex-cursor = "0.1.5"

helix-term/Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ log = "0.4"
7070

7171
# File picker
7272
nucleo.workspace = true
73-
# MSRV: update once the MSRV is >=1.85
74-
ignore = "=0.4.23"
75-
grep-regex = "=0.1.13"
76-
grep-searcher = "=0.1.14"
77-
grep-matcher = "=0.1.7"
73+
ignore = "0.4"
74+
grep-regex = "0.1"
75+
grep-searcher = "0.1"
76+
grep-matcher = "0.1"
7877
# markdown doc rendering
7978
pulldown-cmark = { version = "0.13", default-features = false }
8079
# file type detection

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.82.0"
2+
channel = "1.87.0"
33
components = ["rustfmt", "rust-src", "clippy"]

0 commit comments

Comments
 (0)