From f07c1cc9f56ef225aaecc993282abd6fffa2e178 Mon Sep 17 00:00:00 2001 From: Rolo Date: Fri, 22 Nov 2024 01:12:34 -0800 Subject: [PATCH 1/4] chore(msrv): bump MSRV from 1.70 to 1.76 --- Cargo.toml | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b690267d9..753be4b46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,4 +51,4 @@ categories = ["editor"] repository = "https://github.com/helix-editor/helix" homepage = "https://helix-editor.com" license = "MPL-2.0" -rust-version = "1.70" +rust-version = "1.76" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 7c7cb7f41..70e85c40b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.74.0" +channel = "1.76.0" components = ["rustfmt", "rust-src", "clippy"] From fbe216e11c41d1fceefcd1f182d5799f3d73111e Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Fri, 22 Nov 2024 08:37:37 -0500 Subject: [PATCH 2/4] CI: Match rust-toolchain action to MSRV version --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9f198d0c..a1ef53bdf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,8 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@1.70 + - name: Install MSRV toolchain + uses: dtolnay/rust-toolchain@1.76 - uses: Swatinem/rust-cache@v2 with: @@ -38,8 +38,8 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@1.70 + - name: Install MSRV toolchain + uses: dtolnay/rust-toolchain@1.76 - uses: Swatinem/rust-cache@v2 with: @@ -70,8 +70,8 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@1.70 + - name: Install MSRV toolchain + uses: dtolnay/rust-toolchain@1.76 with: components: rustfmt, clippy @@ -98,8 +98,8 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@1.70 + - name: Install MSRV toolchain + uses: dtolnay/rust-toolchain@1.76 - uses: Swatinem/rust-cache@v2 with: From 46ffec3fd43ed5bd4896c4ac7297a1828e519064 Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Fri, 22 Nov 2024 08:57:20 -0500 Subject: [PATCH 3/4] Add WORKSPACE.bzlmod to starlark file-types (#12103) --- languages.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages.toml b/languages.toml index 54283ea8d..0acb7f420 100644 --- a/languages.toml +++ b/languages.toml @@ -2355,7 +2355,7 @@ source = { git = "https://github.com/sogaiu/tree-sitter-clojure", rev = "e57c569 name = "starlark" scope = "source.starlark" injection-regex = "(starlark|bzl|bazel)" -file-types = ["bzl", "bazel", "star", { glob = "BUILD" }, { glob = "BUILD.*" }, { glob = "Tiltfile" }, { glob = "WORKSPACE" }] +file-types = ["bzl", "bazel", "star", { glob = "BUILD" }, { glob = "BUILD.*" }, { glob = "Tiltfile" }, { glob = "WORKSPACE" }, { glob = "WORKSPACE.bzlmod" }] comment-token = "#" indent = { tab-width = 4, unit = " " } grammar = "python" From cbbeca6c5227e65bebdbe9abbadbd2202ffc1005 Mon Sep 17 00:00:00 2001 From: RoloEdits Date: Fri, 22 Nov 2024 06:10:11 -0800 Subject: [PATCH 4/4] fix(clippy): suppress `unused` lint on windows (#12107) --- helix-term/src/handlers/completion/path.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helix-term/src/handlers/completion/path.rs b/helix-term/src/handlers/completion/path.rs index b7b605073..e92be51cf 100644 --- a/helix-term/src/handlers/completion/path.rs +++ b/helix-term/src/handlers/completion/path.rs @@ -149,7 +149,7 @@ fn path_documentation(md: &fs::Metadata, full_path: &Path, kind: &str) -> String } #[cfg(not(unix))] -fn path_documentation(md: &fs::Metadata, full_path: &Path, kind: &str) -> String { +fn path_documentation(_md: &fs::Metadata, full_path: &Path, kind: &str) -> String { let full_path = fold_home_dir(canonicalize(full_path)); let full_path_name = full_path.to_string_lossy(); format!("type: `{kind}`\nfull path: `{full_path_name}`",)