From 99f31418418eb8e4044d57f7ce8a9c96db3a4015 Mon Sep 17 00:00:00 2001
From: Nutomic <me@nutomic.com>
Date: Tue, 10 May 2022 17:04:40 +0000
Subject: [PATCH] Update to Rust 1.60 (#2247)

---
 .drone.yml                 | 18 +++++++++---------
 .rustfmt.toml              |  2 +-
 docker/dev/Dockerfile      |  2 +-
 docker/prod/Dockerfile     |  2 +-
 docker/prod/Dockerfile.arm |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7b909482a..b7d75eb0a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,7 +9,7 @@ platform:
 steps:
 
   - name: prepare repo
-    image: clux/muslrust:1.56.0
+    image: clux/muslrust:1.60.0
     user: root
     commands:
       - chown 1000:1000 . -R
@@ -23,19 +23,19 @@ steps:
       - /root/.cargo/bin/cargo fmt -- --check
 
   - name: check lemmy_api_common with minimal deps
-    image: clux/muslrust:1.56.0
+    image: clux/muslrust:1.60.0
     commands:
       - cargo check -p lemmy_api_common
 
   - name: cargo clippy
-    image: clux/muslrust:1.56.0
+    image: clux/muslrust:1.60.0
     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.56.0
+    image: clux/muslrust:1.60.0
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
       LEMMY_CONFIG_LOCATION: ../../config/config.hjson
@@ -47,13 +47,13 @@ steps:
       - cargo test --workspace --no-fail-fast
 
   - name: check defaults.hjson updated
-    image: clux/muslrust:1.56.0
+    image: clux/muslrust:1.60.0
     commands:
       - ./scripts/update_config_defaults.sh config/defaults_current.hjson
       - diff config/defaults.hjson config/defaults_current.hjson
 
   - name: cargo build
-    image: clux/muslrust:1.56.0
+    image: clux/muslrust:1.60.0
     commands:
       - cargo build
       - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
@@ -152,7 +152,7 @@ platform:
 steps:
 
   - name: prepare repo
-    image: rust:1.56-slim
+    image: rust:1.60-slim
     user: root
     commands:
       - chown 1000:1000 . -R
@@ -164,7 +164,7 @@ steps:
 
   # TODO temporarily disable arm tests
   # - name: cargo test
-  #   image: rust:1.56-slim
+  #   image: rust:1.60-slim
   #   environment:
   #     LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
   #     LEMMY_CONFIG_LOCATION: ../../config/config.hjson
@@ -179,7 +179,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.56-slim
+  #   image: rust:1.60-slim
   #   commands:
   #     - apt-get update
   #     - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev
diff --git a/.rustfmt.toml b/.rustfmt.toml
index 59528c80b..6bf5e0eda 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,5 +1,5 @@
 tab_spaces = 2
-edition="2018"
+edition="2021"
 imports_layout="HorizontalVertical"
 imports_granularity="Crate"
 reorder_imports=true
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index f1dad5ce4..eca380cc4 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_BUILDER_IMAGE=clux/muslrust:1.56.0
+ARG RUST_BUILDER_IMAGE=clux/muslrust:1.60.0
 
 FROM $RUST_BUILDER_IMAGE as chef
 USER root
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 7257e868b..31deb1478 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -1,5 +1,5 @@
 # Build the project
-FROM clux/muslrust:1.56.0 as builder
+FROM clux/muslrust:1.60.0 as builder
 
 ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
 ARG RUSTRELEASEDIR="release"
diff --git a/docker/prod/Dockerfile.arm b/docker/prod/Dockerfile.arm
index 2a2d15849..2076e942d 100644
--- a/docker/prod/Dockerfile.arm
+++ b/docker/prod/Dockerfile.arm
@@ -1,4 +1,4 @@
-ARG RUST_BUILDER_IMAGE=rust:1.56-slim-buster
+ARG RUST_BUILDER_IMAGE=rust:1.60-slim-buster
 
 # Build Lemmy
 FROM $RUST_BUILDER_IMAGE as builder