diff --git a/packages/deno-lint/Cargo.toml b/packages/deno-lint/Cargo.toml index 4b22c4e2..9228c11a 100644 --- a/packages/deno-lint/Cargo.toml +++ b/packages/deno-lint/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib"] [dependencies] annotate-snippets = {version = "0.9", features = ["color"]} anyhow = "1" -deno_ast = "0.4.1" -deno_lint = "0.18.1" +deno_ast = "0.5.0" +deno_lint = "0.19.0" env_logger = "0.9" global_alloc = {path = "../../crates/alloc"} globwalk = "0.8" diff --git a/packages/deno-lint/cli.ts b/packages/deno-lint/cli.ts index 4d5823f8..c9b23db4 100644 --- a/packages/deno-lint/cli.ts +++ b/packages/deno-lint/cli.ts @@ -12,7 +12,7 @@ class LintCommand extends Command { private readonly checkOnly = Option.Boolean('--check-only', { required: false }) - execute() { + async execute() { const hasError = denolint(this.cwd ?? __dirname, this.configPath ?? '.denolint.json') return Promise.resolve(hasError && !this.checkOnly ? 1 : 0) } diff --git a/packages/deno-lint/src/lib.rs b/packages/deno-lint/src/lib.rs index 494a5fd6..e2ed7f55 100644 --- a/packages/deno-lint/src/lib.rs +++ b/packages/deno-lint/src/lib.rs @@ -182,7 +182,7 @@ fn lint_command(ctx: CallContext) -> Result { status: Status::GenericFailure, reason: format!("Lint failed: {}, at: {:?}", e, &p), })?; - has_error = !file_diagnostics.is_empty(); + has_error = has_error || !file_diagnostics.is_empty(); diagnostics::display_diagnostics(&file_diagnostics, s.source(), true); } } diff --git a/rust-toolchain b/rust-toolchain index e7eda32f..7cc42efd 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-10-21 +nightly-2021-11-01