From 77ee27b4ae0f4511666a7a7319ef60c5708b5ef1 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 23 Mar 2023 11:40:54 +0000
Subject: [PATCH] inline workspace package properties

msrv needs to be 1.64
---
 Cargo.toml                    | 7 ++++---
 actix-cors/Cargo.toml         | 4 ++--
 actix-identity/Cargo.toml     | 4 ++--
 actix-limitation/Cargo.toml   | 4 ++--
 actix-protobuf/Cargo.toml     | 4 ++--
 actix-redis/Cargo.toml        | 4 ++--
 actix-session/Cargo.toml      | 4 ++--
 actix-settings/Cargo.toml     | 4 ++--
 actix-web-httpauth/Cargo.toml | 4 ++--
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 84d60569b..a1993e244 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,10 @@ members = [
     "actix-web-httpauth",
 ]
 
-[workspace.package]
-edition = "2018"
-rust-version = "1.60"
+# TODO(MSRV 1.64)
+# [workspace.package]
+# edition = "2018"
+# rust-version = "1.60"
 
 [patch.crates-io]
 actix-cors = { path = "./actix-cors" }
diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml
index 8ec759285..a347f9787 100644
--- a/actix-cors/Cargo.toml
+++ b/actix-cors/Cargo.toml
@@ -10,8 +10,8 @@ keywords = ["actix", "cors", "web", "security", "crossorigin"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-extras.git"
 license = "MIT OR Apache-2.0"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml
index f3760eaa1..3228226c1 100644
--- a/actix-identity/Cargo.toml
+++ b/actix-identity/Cargo.toml
@@ -10,8 +10,8 @@ keywords = ["actix", "auth", "identity", "web", "security"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-extras.git"
 license = "MIT OR Apache-2.0"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [lib]
 name = "actix_identity"
diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml
index 9656ce541..d92ff3844 100644
--- a/actix-limitation/Cargo.toml
+++ b/actix-limitation/Cargo.toml
@@ -10,8 +10,8 @@ keywords = ["actix-web", "rate-api", "rate-limit", "limitation"]
 categories = ["asynchronous", "web-programming"]
 repository = "https://github.com/actix/actix-extras.git"
 license = "MIT OR Apache-2.0"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [features]
 default = ["session"]
diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml
index 587346f15..dfc0b388b 100644
--- a/actix-protobuf/Cargo.toml
+++ b/actix-protobuf/Cargo.toml
@@ -10,8 +10,8 @@ keywords = ["actix", "web", "protobuf", "protocol", "rpc"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-extras.git"
 license = "MIT OR Apache-2.0"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [lib]
 name = "actix_protobuf"
diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml
index d09917a48..efd95c5b0 100644
--- a/actix-redis/Cargo.toml
+++ b/actix-redis/Cargo.toml
@@ -8,8 +8,8 @@ keywords = ["actix", "redis", "async"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-extras.git"
 categories = ["network-programming", "asynchronous"]
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml
index e91a0276b..3b100f33b 100644
--- a/actix-session/Cargo.toml
+++ b/actix-session/Cargo.toml
@@ -10,8 +10,8 @@ keywords = ["http", "web", "framework", "async", "session"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-extras.git"
 license = "MIT OR Apache-2.0"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml
index 0dd1a872f..f045f5c63 100644
--- a/actix-settings/Cargo.toml
+++ b/actix-settings/Cargo.toml
@@ -7,8 +7,8 @@ authors = [
 ]
 description = "Easily manage Actix Web's settings from a TOML file and environment variables"
 license = "MIT OR Apache-2.0"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [dependencies]
 actix-http = "3"
diff --git a/actix-web-httpauth/Cargo.toml b/actix-web-httpauth/Cargo.toml
index cf0f8aba7..99fab1886 100644
--- a/actix-web-httpauth/Cargo.toml
+++ b/actix-web-httpauth/Cargo.toml
@@ -11,8 +11,8 @@ homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-extras.git"
 categories = ["web-programming::http-server"]
 license = "MIT OR Apache-2.0"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2018"
+rust-version = "1.60"
 
 [lib]
 name = "actix_web_httpauth"