diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df4b520b199..81645c3a0c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - rust-version: [ 1.58, stable ] + rust-version: [ 1.62, stable ] fail-fast: false env: RUSTFLAGS: -D warnings @@ -74,7 +74,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - rust-version: [ 1.58, stable ] + rust-version: [ 1.62, stable ] fail-fast: false env: RUSTFLAGS: -D warnings diff --git a/README.md b/README.md index b299043f5df..b39f40aa702 100644 --- a/README.md +++ b/README.md @@ -86,11 +86,13 @@ metadata`](https://doc.rust-lang.org/cargo/commands/cargo-metadata.html) format. ## Minimum supported Rust version -The minimum supported Rust version (MSRV) is **1.58**. +The minimum supported Rust version (MSRV) is **1.62**. While a crate is pre-release status (0.x.x) it may have its MSRV bumped in a patch release. Once a crate has reached 1.x, any MSRV bump will be accompanied with a new minor version. +At any given time, at least the last 3 versions of Rust will be supported. + ## Contributing See the [CONTRIBUTING](CONTRIBUTING.md) file for how to help out. diff --git a/clippy.toml b/clippy.toml deleted file mode 100644 index ddbdbc1fa25..00000000000 --- a/clippy.toml +++ /dev/null @@ -1 +0,0 @@ -msrv = "1.58" diff --git a/guppy-summaries/CHANGELOG.md b/guppy-summaries/CHANGELOG.md index f80c927da3f..8ac23d1edb9 100644 --- a/guppy-summaries/CHANGELOG.md +++ b/guppy-summaries/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.62. + ## [0.7.1] - 2022-09-30 ### Changed diff --git a/guppy-summaries/Cargo.toml b/guppy-summaries/Cargo.toml index e9aa217cea7..f19c5865a09 100644 --- a/guppy-summaries/Cargo.toml +++ b/guppy-summaries/Cargo.toml @@ -19,7 +19,7 @@ exclude = [ # Readme template that doesn't need to be included. "README.tpl", ] -rust-version = "1.58" +rust-version = "1.62" [package.metadata.docs.rs] all-features = true diff --git a/guppy/CHANGELOG.md b/guppy/CHANGELOG.md index 8e8cf9d89b2..3319a663ffc 100644 --- a/guppy/CHANGELOG.md +++ b/guppy/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.62. + ## [0.15.1] - 2022-12-04 ### Added diff --git a/guppy/Cargo.toml b/guppy/Cargo.toml index 1130a0bfb55..e511ca64261 100644 --- a/guppy/Cargo.toml +++ b/guppy/Cargo.toml @@ -19,7 +19,7 @@ exclude = [ # Readme template that doesn't need to be included. "README.tpl", ] -rust-version = "1.58" +rust-version = "1.62" [package.metadata.docs.rs] all-features = true diff --git a/guppy/src/graph/feature/weak.rs b/guppy/src/graph/feature/weak.rs index 4c13ecba1cd..10de992d4ac 100644 --- a/guppy/src/graph/feature/weak.rs +++ b/guppy/src/graph/feature/weak.rs @@ -85,7 +85,7 @@ where } SingleBufferState::Accepted => { // Weak link, but package already accepted. - Either::Left((self.accept_fn)(link).then(|| edge_ref)) + Either::Left((self.accept_fn)(link).then_some(edge_ref)) } } } @@ -107,7 +107,7 @@ where .into_iter() .filter_map(|(link, edge_ref)| { // Filter buffered links. - (self.accept_fn)(link).then(|| edge_ref) + (self.accept_fn)(link).then_some(edge_ref) }) .collect(); edge_refs.push(edge_ref); diff --git a/target-spec-miette/CHANGELOG.md b/target-spec-miette/CHANGELOG.md index f50d6273537..2628f6614d3 100644 --- a/target-spec-miette/CHANGELOG.md +++ b/target-spec-miette/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.62. + ## [0.1.0] - 2022-10-25 Initial release with support for miette 5. diff --git a/target-spec-miette/Cargo.toml b/target-spec-miette/Cargo.toml index 929bb8cdd0e..cab84cca814 100644 --- a/target-spec-miette/Cargo.toml +++ b/target-spec-miette/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" keywords = ["cargo", "targets", "platforms", "miette"] categories = ["development-tools"] edition = "2021" -rust-version = "1.58" +rust-version = "1.62" [dependencies] target-spec = { version = "1.2.2", path = "../target-spec" } diff --git a/target-spec/CHANGELOG.md b/target-spec/CHANGELOG.md index 478909eb94e..def9bdf6998 100644 --- a/target-spec/CHANGELOG.md +++ b/target-spec/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Unreleased + +### Changed + +- Internal dependency `cfg-expr` updated to 0.13.0, updating builtin targets to Rust 1.66. +- MSRV updated to Rust 1.62. + ## [1.2.2] - 2022-11-07 ### Updated diff --git a/target-spec/Cargo.toml b/target-spec/Cargo.toml index d4cc0588122..fbdd94bfe29 100644 --- a/target-spec/Cargo.toml +++ b/target-spec/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" keywords = ["cargo", "targets", "platforms", "os", "cpu"] categories = ["development-tools", "parser-implementations"] edition = "2021" -rust-version = "1.58" +rust-version = "1.62" [package.metadata.docs.rs] all-features = true diff --git a/tools/cargo-hakari/Cargo.toml b/tools/cargo-hakari/Cargo.toml index d1a1a54619d..08fee4276fe 100644 --- a/tools/cargo-hakari/Cargo.toml +++ b/tools/cargo-hakari/Cargo.toml @@ -15,7 +15,7 @@ keywords = [ "guppy", ] categories = ["development-tools::cargo-plugins"] -rust-version = "1.58" +rust-version = "1.62" [dependencies] camino = "1.1.2" diff --git a/tools/determinator/CHANGELOG.md b/tools/determinator/CHANGELOG.md index 01d31c48968..7c622da1609 100644 --- a/tools/determinator/CHANGELOG.md +++ b/tools/determinator/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.62. + ## [0.10.0] - 2022-11-07 ### Changed diff --git a/tools/determinator/Cargo.toml b/tools/determinator/Cargo.toml index bd982cdb924..39e92dedf18 100644 --- a/tools/determinator/Cargo.toml +++ b/tools/determinator/Cargo.toml @@ -22,7 +22,7 @@ include = [ # Include default rules with the package. "default-rules.toml", ] -rust-version = "1.58" +rust-version = "1.62" [dependencies] camino = "1.1.2" diff --git a/tools/hakari/CHANGELOG.md b/tools/hakari/CHANGELOG.md index 9d7777b2761..a01ed6c5904 100644 --- a/tools/hakari/CHANGELOG.md +++ b/tools/hakari/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.62. + ## [0.11.1] - 2022-12-04 ### Fixed diff --git a/tools/hakari/Cargo.toml b/tools/hakari/Cargo.toml index da45a6c7d32..6924094b840 100644 --- a/tools/hakari/Cargo.toml +++ b/tools/hakari/Cargo.toml @@ -15,7 +15,7 @@ keywords = [ "guppy", ] categories = ["development-tools"] -rust-version = "1.58" +rust-version = "1.62" [package.metadata.docs.rs] all-features = true diff --git a/tools/hakari/src/cli_ops/manage_deps.rs b/tools/hakari/src/cli_ops/manage_deps.rs index 357a125a3a7..88bee940b91 100644 --- a/tools/hakari/src/cli_ops/manage_deps.rs +++ b/tools/hakari/src/cli_ops/manage_deps.rs @@ -37,7 +37,9 @@ impl<'g> HakariBuilder<'g> { (Some(_), false) => Some(false), (Some(link), true) => match self.dep_format_version { DepFormatVersion::V1 => None, - DepFormatVersion::V2 => needs_update_v2(hakari_package, link).then(|| true), + DepFormatVersion::V2 => { + needs_update_v2(hakari_package, link).then_some(true) + } }, (None, false) => None, }