diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d972953e..0e460ebe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,14 +12,6 @@ updates: update-types: - "minor" - "patch" - ignore: - # MSRV: these deps use edition 2024 in their newest versions. - # Once the MSRV reaches 1.85 these can be updated and unignored. - - dependency-name: ignore - - dependency-name: globset - - dependency-name: grep-matcher - # Now requires Rust 1.87: - - dependency-name: etcetera - package-ecosystem: "github-actions" directory: "/" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0ed85fb..7e4ef5f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: - cron: "00 01 * * *" env: - MSRV: "1.82" + MSRV: "1.87" # This key can be changed to bust the cache of tree-sitter grammars. GRAMMAR_CACHE_VERSION: "" diff --git a/Cargo.lock b/Cargo.lock index 38931d30..175cb6d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ahash" @@ -352,13 +352,12 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "etcetera" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6" +checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96" dependencies = [ "cfg-if", - "home", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1254,9 +1253,9 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" +checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" dependencies = [ "aho-corasick", "bstr", @@ -1267,18 +1266,18 @@ dependencies = [ [[package]] name = "grep-matcher" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" +checksum = "36d7b71093325ab22d780b40d7df3066ae4aebb518ba719d38c697a8228a8023" dependencies = [ "memchr", ] [[package]] name = "grep-regex" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edd147c7e3296e7a26bd3a81345ce849557d5a8e48ed88f736074e760f91f7e" +checksum = "0ce0c256c3ad82bcc07b812c15a45ec1d398122e8e15124f96695234db7112ef" dependencies = [ "bstr", "grep-matcher", @@ -1289,9 +1288,9 @@ dependencies = [ [[package]] name = "grep-searcher" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b6c14b3fc2e0a107d6604d3231dec0509e691e62447104bc385a46a7892cda" +checksum = "ac63295322dc48ebb20a25348147905d816318888e64f531bfc2a2bc0577dc34" dependencies = [ "bstr", "encoding_rs", @@ -1800,9 +1799,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.23" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" +checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" dependencies = [ "crossbeam-deque", "globset", diff --git a/Cargo.toml b/Cargo.toml index 42538d81..330915f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,8 +54,8 @@ tokio-stream = "0.1.18" toml = "0.9" termina = "0.1" sonic-rs = "0.5" -# MSRV: update once the MSRV is >=1.85 -globset = "=0.4.16" +globset = "0.4" +etcetera = "0.11" [workspace.package] version = "25.7.1" @@ -65,4 +65,4 @@ categories = ["editor"] repository = "https://github.com/helix-editor/helix" homepage = "https://helix-editor.com" license = "MPL-2.0" -rust-version = "1.82" +rust-version = "1.87" diff --git a/helix-core/src/test.rs b/helix-core/src/test.rs index 71c71cce..05fa3e60 100644 --- a/helix-core/src/test.rs +++ b/helix-core/src/test.rs @@ -286,10 +286,7 @@ mod test { #[test] fn print_multi_code_point_grapheme() { assert_eq!( - ( - String::from("hello ๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ goodbye"), - Selection::single(13, 6) - ), + (String::from("hello ๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ goodbye"), Selection::single(13, 6)), print("hello #[|๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ]# goodbye") ); } diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml index acbdc5d5..88267868 100644 --- a/helix-loader/Cargo.toml +++ b/helix-loader/Cargo.toml @@ -20,7 +20,7 @@ helix-stdx = { path = "../helix-stdx" } anyhow = "1" serde = { version = "1.0", features = ["derive"] } toml.workspace = true -etcetera = "0.10" +etcetera.workspace = true once_cell = "1.21" log = "0.4" diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml index 7fa471fe..deb99e9d 100644 --- a/helix-stdx/Cargo.toml +++ b/helix-stdx/Cargo.toml @@ -13,7 +13,7 @@ homepage.workspace = true [dependencies] dunce = "1.0" -etcetera = "0.10" +etcetera.workspace = true ropey.workspace = true which = "8.0" regex-cursor = "0.1.5" diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml index 38e7fae3..8446f1a6 100644 --- a/helix-term/Cargo.toml +++ b/helix-term/Cargo.toml @@ -70,11 +70,10 @@ log = "0.4" # File picker nucleo.workspace = true -# MSRV: update once the MSRV is >=1.85 -ignore = "=0.4.23" -grep-regex = "=0.1.13" -grep-searcher = "=0.1.14" -grep-matcher = "=0.1.7" +ignore = "0.4" +grep-regex = "0.1" +grep-searcher = "0.1" +grep-matcher = "0.1" # markdown doc rendering pulldown-cmark = { version = "0.13", default-features = false } # file type detection diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 74c6fc7a..00ca8bbb 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.82.0" +channel = "1.87.0" components = ["rustfmt", "rust-src", "clippy"]