diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc184868740cd4..ecb4243a745a60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -236,7 +236,7 @@ jobs: ~/.cargo/registry/index ~/.cargo/registry/cache ~/.cargo/git/db - key: 13-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }} + key: 14-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }} # In main branch, always creates fresh cache - name: Cache build output (main) @@ -252,7 +252,7 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: | - 13-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }} + 14-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }} # Restore cache from the latest 'main' branch build. - name: Cache build output (PR) @@ -268,7 +268,7 @@ jobs: !./target/*/*.tar.gz key: never_saved restore-keys: | - 13-cargo-target-${{ matrix.os }}-${{ matrix.profile }}- + 14-cargo-target-${{ matrix.os }}-${{ matrix.profile }}- # Don't save cache after building PRs or branches other than 'main'. - name: Skip save cache (PR) diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs index 4f5ad0fe855ac3..f251dc64752bd6 100644 --- a/cli/tools/lint.rs +++ b/cli/tools/lint.rs @@ -508,7 +508,7 @@ impl LintReporter for JsonLintReporter { } } -fn sort_diagnostics(diagnostics: &mut Vec) { +fn sort_diagnostics(diagnostics: &mut [LintDiagnostic]) { // Sort so that we guarantee a deterministic output which is useful for tests diagnostics.sort_by(|a, b| { use std::cmp::Ordering; diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs index f0964ec4d9d9a3..7ca229ab349fb2 100644 --- a/cli/tools/repl/mod.rs +++ b/cli/tools/repl/mod.rs @@ -133,7 +133,7 @@ pub async fn run( // We check for close and break here instead of making it a loop condition to get // consistent behavior in when the user evaluates a call to close(). - if repl_session.is_closing().await? { + if repl_session.closing().await? { break; } diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs index d72fc949960854..c256172e49816a 100644 --- a/cli/tools/repl/session.rs +++ b/cli/tools/repl/session.rs @@ -116,7 +116,7 @@ impl ReplSession { Ok(repl_session) } - pub async fn is_closing(&mut self) -> Result { + pub async fn closing(&mut self) -> Result { let closed = self .evaluate_expression("(this.closed)") .await? diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 7bdffcd28d804e..36189978f74ae8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.59.0" +channel = "1.60.0" components = ["rustfmt", "clippy"]