From 49c917d2c5f2ecabcdd39c815c8fc9566b1eaf8c Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 22 Sep 2023 15:21:47 +0200 Subject: [PATCH 1/2] Use or_default() in test --- tests/r299.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/r299.rs b/tests/r299.rs index 39e3e3cc..a646ffce 100644 --- a/tests/r299.rs +++ b/tests/r299.rs @@ -17,7 +17,7 @@ fn add_successor( to: &Point, cost: usize, ) { - let entry = n.entry(from.clone()).or_insert_with(Vec::new); + let entry = n.entry(from.clone()).or_default(); entry.push((to.clone(), cost)); } From 7dfd691fb181d897c817331fb7a255940c1236a9 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 22 Sep 2023 15:51:34 +0200 Subject: [PATCH 2/2] Update MSRV to 1.70.0 --- .github/bors.toml | 2 +- .github/workflows/tests.yml | 2 +- Cargo.toml | 2 +- README.md | 2 +- tests/ui.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/bors.toml b/.github/bors.toml index 3fd86864..e66af99f 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -1,5 +1,5 @@ status = [ "Check", "cargo deny", "pre-commit", "Rustfmt", "Clippy", "Test with minimal versions", - "Test suite (stable)", "Test suite (beta)", "Test suite (nightly)", "Test suite (1.65.0)" + "Test suite (stable)", "Test suite (beta)", "Test suite (nightly)", "Test suite (1.70.0)" ] delete_merged_branches = true diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d69a1e69..b5eebf84 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,7 @@ jobs: needs: check strategy: matrix: - toolchain: [stable, beta, nightly, 1.65.0] + toolchain: [stable, beta, nightly, 1.70.0] fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/Cargo.toml b/Cargo.toml index 67ccd7dc..814c189d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ authors = ["Samuel Tardieu "] categories = ["algorithms"] readme = "README.md" edition = "2021" -rust-version = "1.65.0" +rust-version = "1.70.0" [package.metadata.release] sign-commit = true diff --git a/README.md b/README.md index 74b9fce4..e7872865 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ floating-point types (such as `f32`) that implement `PartialOrd` in this context, you can wrap them into compliant types using the [ordered-float](https://crates.io/crates/ordered-float) crate. -The minimum supported Rust version (MSRV) is Rust 1.65.0. +The minimum supported Rust version (MSRV) is Rust 1.70.0. ## License diff --git a/tests/ui.rs b/tests/ui.rs index 2b87c108..5b2c1272 100644 --- a/tests/ui.rs +++ b/tests/ui.rs @@ -1,7 +1,7 @@ #[test] fn ui() { match std::env::var("TOOLCHAIN").as_deref() { - Ok("stable") | Ok("1.65.0") => (), + Ok("stable") | Ok("1.70.0") => (), _ => { let t = trybuild::TestCases::new(); t.compile_fail("tests/ui/*.rs");