From 7a961436d8c2b9cf09e9576a0c9341acb302f49c Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 14 Mar 2023 02:25:21 -0500
Subject: [PATCH] chore: Update MSRV to 1.64.0

---
 .clippy.toml             |  2 +-
 .github/workflows/ci.yml |  6 +++---
 Cargo.toml               | 29 +++++++++++++++++++----------
 crates/core/Cargo.toml   | 14 ++++----------
 crates/tree/Cargo.toml   | 14 ++++----------
 5 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/.clippy.toml b/.clippy.toml
index 23bf481..23fc604 100644
--- a/.clippy.toml
+++ b/.clippy.toml
@@ -1 +1 @@
-msrv = "1.60.0"  # MSRV
+msrv = "1.64.0"  # MSRV
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1c48e4..1b22018 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
     - name: No-default features
       run: cargo test --workspace --no-default-features
   msrv:
-    name: "Check MSRV: 1.60.0"
+    name: "Check MSRV: 1.64.0"
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
@@ -59,7 +59,7 @@ jobs:
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.60.0  # MSRV
+        toolchain: 1.64.0  # MSRV
         profile: minimal
         override: true
     - uses: Swatinem/rust-cache@v2
@@ -113,7 +113,7 @@ jobs:
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.60.0  # MSRV
+        toolchain: 1.64.0  # MSRV
         profile: minimal
         override: true
         components: clippy
diff --git a/Cargo.toml b/Cargo.toml
index b4dbc8c..eb2cc89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,27 +1,36 @@
 [workspace]
 members = ["crates/*"]
+resolver = "2"
+
+[workspace.package]
+license = "MIT OR Apache-2.0"
+edition = "2021"
+rust-version = "1.64.0"  # MSRV
+include = [
+  "build.rs",
+  "src/**/*",
+  "Cargo.toml",
+  "LICENSE*",
+  "README.md",
+  "benches/**/*",
+  "examples/**/*"
+]
 
 [package]
 name = "predicates"
 version = "2.1.5"
 description = "An implementation of boolean-valued predicate functions."
 authors = ["Nick Stevens <nick@bitcurry.com>"]
-license = "MIT OR Apache-2.0"
 repository = "https://github.com/assert-rs/predicates-rs"
 homepage = "https://github.com/assert-rs/predicates-rs"
 documentation = "https://docs.rs/predicates"
 readme = "README.md"
 categories = ["data-structures", "rust-patterns"]
 keywords = ["predicate", "boolean", "combinatorial", "match", "logic"]
-edition = "2021"
-rust-version = "1.60.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
 
 [package.metadata.release]
 pre-release-replacements = [
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 05352ff..a9866f9 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -3,19 +3,13 @@ name = "predicates-core"
 version = "1.0.5"
 description = "An API for boolean-valued predicate functions."
 authors = ["Nick Stevens <nick@bitcurry.com>"]
-license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/assert-rs/predicates-rs/tree/master/crates/core"
 homepage = "https://github.com/assert-rs/predicates-rs/tree/master/crates/core"
 documentation = "https://docs.rs/predicates-core"
 categories = ["data-structures", "rust-patterns"]
 keywords = ["predicate", "boolean", "combinatorial", "match", "logic"]
-edition = "2021"
-rust-version = "1.60.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
diff --git a/crates/tree/Cargo.toml b/crates/tree/Cargo.toml
index aadffa4..8298e74 100644
--- a/crates/tree/Cargo.toml
+++ b/crates/tree/Cargo.toml
@@ -3,22 +3,16 @@ name = "predicates-tree"
 version = "1.0.7"
 authors = ["Nick Stevens <nick@bitcurry.com>"]
 description = "Render boolean-valued predicate functions results as a tree."
-license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/assert-rs/predicates-rs/tree/master/crates/tree"
 homepage = "https://github.com/assert-rs/predicates-rs/tree/master/crates/tree"
 documentation = "https://docs.rs/predicates-tree"
 categories = ["data-structures", "rust-patterns"]
 keywords = ["predicate", "boolean", "combinatorial", "match", "logic"]
-edition = "2021"
-rust-version = "1.60.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
 
 [dependencies]
 predicates-core = { version = "1.0", path = "../core" }