Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to Rust 1.60 #14590

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cli/tools/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ impl LintReporter for JsonLintReporter {
}
}

fn sort_diagnostics(diagnostics: &mut Vec<LintDiagnostic>) {
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;
Expand Down
2 changes: 1 addition & 1 deletion cli/tools/repl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion cli/tools/repl/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl ReplSession {
Ok(repl_session)
}

pub async fn is_closing(&mut self) -> Result<bool, AnyError> {
pub async fn closing(&mut self) -> Result<bool, AnyError> {
let closed = self
.evaluate_expression("(this.closed)")
.await?
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.59.0"
channel = "1.60.0"
components = ["rustfmt", "clippy"]