Properly require clippy installation, try to shuffle clippy arguments

Kirill Bulatov and Piotr created 2 years ago

co-authored-by: Piotr <[e-mail]>

Change summary

.github/actions/check_style/action.yml | 35 +++++++++++++--------------
crates/editor/src/editor_tests.rs      |  1 
rust-toolchain.toml                    |  2 
3 files changed, 19 insertions(+), 19 deletions(-)

Detailed changes

.github/actions/check_style/action.yml

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

crates/editor/src/editor_tests.rs

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

rust-toolchain.toml

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