From eddf9f0b7f2eacac690afad05abdae398bb17366 Mon Sep 17 00:00:00 2001 From: Jonathan LEI Date: Mon, 7 Nov 2022 12:39:18 +0800 Subject: [PATCH] Run clippy on workspace in CI (#4614) --- .github/workflows/build.yml | 2 +- helix-core/src/test.rs | 1 + xtask/src/querycheck.rs | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef47a277b..157343618 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,7 +101,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: clippy - args: --all-targets -- -D warnings + args: --workspace --all-targets -- -D warnings - name: Run cargo doc uses: actions-rs/cargo@v1 diff --git a/helix-core/src/test.rs b/helix-core/src/test.rs index 3e54d2c24..17523ed76 100644 --- a/helix-core/src/test.rs +++ b/helix-core/src/test.rs @@ -148,6 +148,7 @@ pub fn plain(s: &str, selection: Selection) -> String { } #[cfg(test)] +#[allow(clippy::module_inception)] mod test { use super::*; diff --git a/xtask/src/querycheck.rs b/xtask/src/querycheck.rs index 7014c7d6f..454d0e5cd 100644 --- a/xtask/src/querycheck.rs +++ b/xtask/src/querycheck.rs @@ -17,8 +17,8 @@ pub fn query_check() -> Result<(), DynError> { let language_name = &language.language_id; let grammar_name = language.grammar.as_ref().unwrap_or(language_name); for query_file in query_files { - let language = get_language(&grammar_name); - let query_text = read_query(&language_name, query_file); + let language = get_language(grammar_name); + let query_text = read_query(language_name, query_file); if let Ok(lang) = language { if !query_text.is_empty() { if let Err(reason) = Query::new(lang, &query_text) {