From 3ab73d70c29b08811134d1f274251708c9390515 Mon Sep 17 00:00:00 2001 From: arlecchino Date: Mon, 17 Jan 2022 19:55:29 +0100 Subject: [PATCH 1/8] build!: update MSRV 1.51.0 Dependency multer -> spin doesn't build below rust 1.51.0 which seems to be related to * atomic::spin_loop_hint has been deprecated. It's recommended to use hint::spin_loop instead. --- core/lib/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/build.rs b/core/lib/build.rs index dd11943ba9..413c5fbc7c 100644 --- a/core/lib/build.rs +++ b/core/lib/build.rs @@ -3,7 +3,7 @@ use yansi::{Paint, Color::{Red, Yellow}}; fn main() { - const MIN_VERSION: &str = "1.46.0"; + const MIN_VERSION: &str = "1.51.0"; if let Some(version) = version_check::Version::read() { if !version.at_least(MIN_VERSION) { From 2da8c53e0dc4d68d282ad0f467a1354ba8c332d4 Mon Sep 17 00:00:00 2001 From: arlecchino Date: Mon, 17 Jan 2022 19:58:37 +0100 Subject: [PATCH 2/8] build: Cargo.toml package.metatdata.msrv = 1.51.0 --- core/lib/Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/lib/Cargo.toml b/core/lib/Cargo.toml index 758fb4ea6e..c2ccfe5807 100644 --- a/core/lib/Cargo.toml +++ b/core/lib/Cargo.toml @@ -15,6 +15,10 @@ build = "build.rs" categories = ["web-programming::http-server"] edition = "2018" +[package.metadata] +# minimum supported rust version 1.51.0 because of dependencies multer -> spin +msrv = "1.51.0" + [package.metadata.docs.rs] all-features = true From 664773d4fa844caf8e83172145e33980bbef56d5 Mon Sep 17 00:00:00 2001 From: arlecchino Date: Mon, 17 Jan 2022 20:01:00 +0100 Subject: [PATCH 3/8] build: Cargo.toml package.metadata.msrv = 1.51.0 resolving fails below because of crate time --- core/http/Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/http/Cargo.toml b/core/http/Cargo.toml index f8bdc16523..0fcb7f2213 100644 --- a/core/http/Cargo.toml +++ b/core/http/Cargo.toml @@ -14,6 +14,10 @@ license = "MIT OR Apache-2.0" categories = ["web-programming"] edition = "2018" +[package.metadata] +# minimum supported rust version 1.51.0 because of cargo resolver in dependency crate time +msrv = "1.51.0" + [features] default = [] tls = ["rustls", "tokio-rustls"] From 5a27bef0667453bf70c7ae768f481dd9c0641291 Mon Sep 17 00:00:00 2001 From: arlecchino Date: Mon, 17 Jan 2022 20:02:18 +0100 Subject: [PATCH 4/8] build: Cargo.toml package.metadata.msrv = 1.51.0 cargo resolving fails below because of crate time --- core/codegen/Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/codegen/Cargo.toml b/core/codegen/Cargo.toml index 1832784487..5d7739abe5 100644 --- a/core/codegen/Cargo.toml +++ b/core/codegen/Cargo.toml @@ -11,6 +11,10 @@ keywords = ["rocket", "web", "framework", "code", "generation"] license = "MIT OR Apache-2.0" edition = "2018" +[package.metadata] +# minimum supported rust version 1.51.0 because of cargo resolver in dependency crate time +msrv = "1.51.0" + [lib] proc-macro = true From b175e2ae8b0b28adf03441a52c309df1acd01db4 Mon Sep 17 00:00:00 2001 From: Markus Kolb Date: Tue, 18 Jan 2022 13:37:49 +0100 Subject: [PATCH 5/8] build!: contrib/db_pools MSRV 1.53.0 --- contrib/db_pools/lib/Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/db_pools/lib/Cargo.toml b/contrib/db_pools/lib/Cargo.toml index 80c5e40ee1..6f812c107f 100644 --- a/contrib/db_pools/lib/Cargo.toml +++ b/contrib/db_pools/lib/Cargo.toml @@ -9,6 +9,11 @@ keywords = ["rocket", "framework", "database", "pools"] license = "MIT OR Apache-2.0" edition = "2018" +[package.metadata] +# minimum supported rust version 1.53.0 because of +# error[E0391]: cycle detected when computing the supertraits of `database::Database` +msrv = 1.53.0 + [package.metadata.docs.rs] all-features = true From 6c3780a91fcf946471f57701efa06dfdcb7bcda9 Mon Sep 17 00:00:00 2001 From: Markus Kolb Date: Tue, 18 Jan 2022 13:39:07 +0100 Subject: [PATCH 6/8] build!: TlsConfig::with_ciphers() MSRV 1.53.0 --- core/lib/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/lib/Cargo.toml b/core/lib/Cargo.toml index c2ccfe5807..bb13fd4149 100644 --- a/core/lib/Cargo.toml +++ b/core/lib/Cargo.toml @@ -16,8 +16,10 @@ categories = ["web-programming::http-server"] edition = "2018" [package.metadata] -# minimum supported rust version 1.51.0 because of dependencies multer -> spin -msrv = "1.51.0" +# minimum supported rust version 1.53.0 because of +# TlsConfig::with_ciphers() based on crate indexmap needs IntoIterator impls +# on arrays of any length from 1.53.0 +msrv = "1.53.0" [package.metadata.docs.rs] all-features = true From cdc68f74165456bb4e5ae475624dd7f23f18d497 Mon Sep 17 00:00:00 2001 From: Markus Kolb Date: Tue, 18 Jan 2022 13:39:54 +0100 Subject: [PATCH 7/8] build!: build.rs require rustc 1.53.0 --- core/lib/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/build.rs b/core/lib/build.rs index 413c5fbc7c..d934514a25 100644 --- a/core/lib/build.rs +++ b/core/lib/build.rs @@ -3,7 +3,7 @@ use yansi::{Paint, Color::{Red, Yellow}}; fn main() { - const MIN_VERSION: &str = "1.51.0"; + const MIN_VERSION: &str = "1.53.0"; if let Some(version) = version_check::Version::read() { if !version.at_least(MIN_VERSION) { From 929d9d2a3b2ab39c2ebd2f226aed9c4959c31c1e Mon Sep 17 00:00:00 2001 From: Markus Kolb Date: Tue, 18 Jan 2022 13:53:26 +0100 Subject: [PATCH 8/8] fix(build): typos in Cargo.toml --- contrib/db_pools/lib/Cargo.toml | 2 +- core/lib/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/db_pools/lib/Cargo.toml b/contrib/db_pools/lib/Cargo.toml index 6f812c107f..c704471c6c 100644 --- a/contrib/db_pools/lib/Cargo.toml +++ b/contrib/db_pools/lib/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [package.metadata] # minimum supported rust version 1.53.0 because of # error[E0391]: cycle detected when computing the supertraits of `database::Database` -msrv = 1.53.0 +msrv = "1.53.0" [package.metadata.docs.rs] all-features = true diff --git a/core/lib/Cargo.toml b/core/lib/Cargo.toml index bb13fd4149..817dffad2c 100644 --- a/core/lib/Cargo.toml +++ b/core/lib/Cargo.toml @@ -16,7 +16,7 @@ categories = ["web-programming::http-server"] edition = "2018" [package.metadata] -# minimum supported rust version 1.53.0 because of +# minimum supported rust version 1.53.0 because of # TlsConfig::with_ciphers() based on crate indexmap needs IntoIterator impls # on arrays of any length from 1.53.0 msrv = "1.53.0"