From ad1f15eb18ebf13f35f0cc5556fd8e077fa29b88 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Wed, 22 Mar 2023 21:17:30 +0000 Subject: [PATCH] centralize msrv and edition specs --- Cargo.toml | 4 ++++ actix-cors/Cargo.toml | 3 ++- actix-identity/Cargo.toml | 3 ++- actix-limitation/Cargo.toml | 3 ++- actix-protobuf/Cargo.toml | 3 ++- actix-redis/Cargo.toml | 3 ++- actix-session/Cargo.toml | 3 ++- actix-settings/Cargo.toml | 3 ++- actix-web-httpauth/Cargo.toml | 3 ++- 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a7e099ede..84d60569b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,10 @@ members = [ "actix-web-httpauth", ] +[workspace.package] +edition = "2018" +rust-version = "1.60" + [patch.crates-io] actix-cors = { path = "./actix-cors" } actix-identity = { path = "./actix-identity" } diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml index 88bb286ad..8ec759285 100644 --- a/actix-cors/Cargo.toml +++ b/actix-cors/Cargo.toml @@ -10,7 +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 = "2018" +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index 2eb3f0876..f3760eaa1 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -10,7 +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 = "2018" +edition.workspace = true +rust-version.workspace = true [lib] name = "actix_identity" diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index 44199f38f..9656ce541 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -10,7 +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 = "2018" +edition.workspace = true +rust-version.workspace = true [features] default = ["session"] diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index e2e85d08f..587346f15 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "actix-protobuf" version = "0.9.0" -edition = "2018" authors = [ "kingxsp ", "Yuki Okushi ", @@ -11,6 +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 [lib] name = "actix_protobuf" diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml index 683179bbb..d09917a48 100644 --- a/actix-redis/Cargo.toml +++ b/actix-redis/Cargo.toml @@ -8,7 +8,8 @@ keywords = ["actix", "redis", "async"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-extras.git" categories = ["network-programming", "asynchronous"] -edition = "2018" +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] all-features = true diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 2eda122de..e91a0276b 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -10,7 +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 = "2018" +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] all-features = true diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml index 477fab353..0dd1a872f 100644 --- a/actix-settings/Cargo.toml +++ b/actix-settings/Cargo.toml @@ -5,9 +5,10 @@ authors = [ "Joey Ezechiels ", "Rob Ede ", ] -edition = "2018" 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 [dependencies] actix-http = "3" diff --git a/actix-web-httpauth/Cargo.toml b/actix-web-httpauth/Cargo.toml index 95116c09f..cf0f8aba7 100644 --- a/actix-web-httpauth/Cargo.toml +++ b/actix-web-httpauth/Cargo.toml @@ -11,7 +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 = "2018" +edition.workspace = true +rust-version.workspace = true [lib] name = "actix_web_httpauth"