zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Properly require clippy installation, try to shuffle clippy arguments

Browse Source 
co-authored-by: Piotr <piotr@zed.dev>
This commit is contained in:
Kirill Bulatov 2024-01-11 13:56:28 +02:00
parent 1200f595a3
commit a5dd2535f1
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
.github/actions/check_style/action.yml vendored
View File

@ -2,23 +2,22 @@ name: "Check formatting"
description: "Checks code formatting use cargo fmt" description: "Checks code formatting use cargo fmt"
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Install Rust - name: Install Rust
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
run: | run: |
rustup set profile minimal rustup set profile minimal
rustup update stable rustup update stable
rustup component add clippy
- name: cargo fmt - name: cargo fmt
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
run: cargo fmt --all -- --check run: cargo fmt --all -- --check
- name: cargo clippy - name: cargo clippy
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
# clippy.toml is not currently supporting specifying allowed lints # clippy.toml is not currently supporting specifying allowed lints
# so specify those here, and disable the rest until Zed's workspace # so specify those here, and disable the rest until Zed's workspace
# will have more fixes & suppression for the standard lint set # will have more fixes & suppression for the standard lint set
run: | run: |
CARGO_LOG=debug cargo -vvv clippy --workspace --all-features -- -A clippy::all -D clippy::dbg_macro -D clippy::todo cargo clippy --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo

1
crates/editor/src/editor_tests.rs
View File

@ -8242,6 +8242,7 @@ pub(crate) fn update_test_project_settings(
} }
pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsContent)) { pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsContent)) {
dbg!("(???????????");
_ = cx.update(|cx| { _ = cx.update(|cx| {
let store = SettingsStore::test(cx); let store = SettingsStore::test(cx);
cx.set_global(store); cx.set_global(store);

2
rust-toolchain.toml
View File

@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "1.75" channel = "1.75"
components = [ "rustfmt" ] components = [ "rustfmt", "clippy" ]
targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ] targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ]