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

Merge branch 'helix-editor:master' into pull-diagnostics

Browse Source
This commit is contained in:
SofusA 2024-11-24 12:09:12 +01:00 committed by GitHub
commit ab117aaeb0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@ jobs:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install stable toolchain - name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@1.70 uses: dtolnay/rust-toolchain@1.76
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
with: with:
@ -38,8 +38,8 @@ jobs:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install stable toolchain - name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@1.70 uses: dtolnay/rust-toolchain@1.76
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
with: with:
@ -70,8 +70,8 @@ jobs:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install stable toolchain - name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@1.70 uses: dtolnay/rust-toolchain@1.76
with: with:
components: rustfmt, clippy components: rustfmt, clippy
@ -98,8 +98,8 @@ jobs:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install stable toolchain - name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@1.70 uses: dtolnay/rust-toolchain@1.76
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
with: with:

2
Cargo.toml
View File

@ -51,4 +51,4 @@ categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"
homepage = "https://helix-editor.com" homepage = "https://helix-editor.com"
license = "MPL-2.0" license = "MPL-2.0"
rust-version = "1.70" rust-version = "1.76"

2
helix-term/src/handlers/completion/path.rs
View File

@ -149,7 +149,7 @@ fn path_documentation(md: &fs::Metadata, full_path: &Path, kind: &str) -> String
} }
#[cfg(not(unix))] #[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 = fold_home_dir(canonicalize(full_path));
let full_path_name = full_path.to_string_lossy(); let full_path_name = full_path.to_string_lossy();
format!("type: `{kind}`\nfull path: `{full_path_name}`",) format!("type: `{kind}`\nfull path: `{full_path_name}`",)

2
languages.toml
View File

@ -2355,7 +2355,7 @@ source = { git = "https://github.com/sogaiu/tree-sitter-clojure", rev = "e57c569
name = "starlark" name = "starlark"
scope = "source.starlark" scope = "source.starlark"
injection-regex = "(starlark|bzl|bazel)" 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 = "#" comment-token = "#"
indent = { tab-width = 4, unit = " " } indent = { tab-width = 4, unit = " " }
grammar = "python" grammar = "python"

2
rust-toolchain.toml
View File

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "1.74.0" channel = "1.76.0"
components = ["rustfmt", "rust-src", "clippy"] components = ["rustfmt", "rust-src", "clippy"]