From: Nutomic <me@nutomic.com>
Date: Tue, 28 Jun 2022 21:44:55 +0000 (+0000)
Subject: Specify minimum Rust version 1.57 (fixes #2333) (#2334)
X-Git-Url: http://these/git/%7BfrontRss%7D?a=commitdiff_plain;h=587a0de8f7dc00ff5c19ebafd13be4d4594c69b2;p=lemmy.git

Specify minimum Rust version 1.57 (fixes #2333) (#2334)

* Specify minimum Rust version 1.57 (fixes #2333)

* use latest rust for clippy

* use rust 1.60 for clippy

* no add component

* use official rust docker

* comments
---

diff --git a/.drone.yml b/.drone.yml
index 628abf56..d18e2650 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,8 +8,9 @@ platform:
 
 steps:
 
+  # use minimum supported rust version for most steps
   - name: prepare repo
-    image: clux/muslrust:1.59.0
+    image: clux/muslrust:1.57.0
     user: root
     commands:
       - git fetch --tags
@@ -22,15 +23,16 @@ steps:
     commands:
       - /root/.cargo/bin/cargo fmt -- --check
 
+  # latest rust for clippy to get extra checks
   - name: cargo clippy
-    image: clux/muslrust:1.59.0
+    image: rust:1.61-buster
     commands:
       - rustup component add clippy
       - cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
       - cargo clippy --workspace -- -D clippy::unwrap_used
 
   - name: cargo test
-    image: clux/muslrust:1.59.0
+    image: clux/muslrust:1.57.0
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
       LEMMY_CONFIG_LOCATION: ../../config/config.hjson
@@ -42,20 +44,20 @@ steps:
       - cargo test --workspace --no-fail-fast
 
   - name: check defaults.hjson updated
-    image: clux/muslrust:1.59.0
+    image: clux/muslrust:1.57.0
     commands:
       - ./scripts/update_config_defaults.sh config/defaults_current.hjson
       - diff config/defaults.hjson config/defaults_current.hjson
 
   - name: check with different features
-    image: clux/muslrust:1.59.0
+    image: clux/muslrust:1.57.0
     commands:
       - cargo install cargo-workspaces
       - cargo workspaces exec cargo check --no-default-features
       - cargo workspaces exec cargo check --all-features
 
   - name: cargo build
-    image: clux/muslrust:1.59.0
+    image: clux/muslrust:1.57.0
     commands:
       - cargo build
       - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
@@ -169,7 +171,7 @@ platform:
 steps:
 
   - name: prepare repo
-    image: rust:1.60-slim
+    image: rust:1.57-slim
     user: root
     commands:
       - chown 1000:1000 . -R
@@ -181,7 +183,7 @@ steps:
 
   # TODO temporarily disable arm tests
   # - name: cargo test
-  #   image: rust:1.60-slim
+  #   image: rust:1.57-slim
   #   environment:
   #     LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
   #     LEMMY_CONFIG_LOCATION: ../../config/config.hjson
@@ -196,7 +198,7 @@ steps:
   # TODO temporarily disable arm tests
   # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM.
   # - name: cargo build
-  #   image: rust:1.60-slim
+  #   image: rust:1.57-slim
   #   commands:
   #     - apt-get update
   #     - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev
diff --git a/Cargo.toml b/Cargo.toml
index 6c419d07..c3d52425 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 doctest = false
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
index 9c65978f..2b80f16e 100644
--- a/crates/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 name = "lemmy_api"
diff --git a/crates/api_common/Cargo.toml b/crates/api_common/Cargo.toml
index 4b10207f..65cac308 100644
--- a/crates/api_common/Cargo.toml
+++ b/crates/api_common/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 name = "lemmy_api_common"
diff --git a/crates/api_crud/Cargo.toml b/crates/api_crud/Cargo.toml
index 12ea4305..0d709aa2 100644
--- a/crates/api_crud/Cargo.toml
+++ b/crates/api_crud/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [dependencies]
 lemmy_apub = { version = "=0.16.5", path = "../apub" }
diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml
index 7ec5ece6..7e8e9528 100644
--- a/crates/apub/Cargo.toml
+++ b/crates/apub/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 name = "lemmy_apub"
diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml
index e5f74938..a8eb027b 100644
--- a/crates/db_schema/Cargo.toml
+++ b/crates/db_schema/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 name = "lemmy_db_schema"
diff --git a/crates/db_views/Cargo.toml b/crates/db_views/Cargo.toml
index f8806e43..956ec8f0 100644
--- a/crates/db_views/Cargo.toml
+++ b/crates/db_views/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 doctest = false
diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml
index ccf4a4a7..ba31b778 100644
--- a/crates/db_views_actor/Cargo.toml
+++ b/crates/db_views_actor/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 doctest = false
diff --git a/crates/db_views_moderator/Cargo.toml b/crates/db_views_moderator/Cargo.toml
index fb1f0b56..b00752ad 100644
--- a/crates/db_views_moderator/Cargo.toml
+++ b/crates/db_views_moderator/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 doctest = false
diff --git a/crates/routes/Cargo.toml b/crates/routes/Cargo.toml
index 4b9a946c..b6af9986 100644
--- a/crates/routes/Cargo.toml
+++ b/crates/routes/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 doctest = false
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index 4fcf4183..0ceac090 100644
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 name = "lemmy_utils"
diff --git a/crates/websocket/Cargo.toml b/crates/websocket/Cargo.toml
index b20e3a80..5cfa9717 100644
--- a/crates/websocket/Cargo.toml
+++ b/crates/websocket/Cargo.toml
@@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 name = "lemmy_websocket"