From 3b95b9f4953d01844a6a1852c8b78fe4e84f3f1f Mon Sep 17 00:00:00 2001
From: Dominic <git@msrd0.de>
Date: Wed, 17 Feb 2021 03:39:49 +0100
Subject: [PATCH] update trybuild rust version and rustfmt

---
 .gitlab-ci.yml | 11 ++++++++---
 rustfmt.toml   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab2e9d0..01a97f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ test-tarpaulin:
 
 test-trybuild-ui:
   stage: test
-  image: rust:1.49-slim
+  image: rust:1.50-slim
   before_script:
     - apt update -y
     - apt install -y --no-install-recommends libpq-dev
@@ -67,7 +67,7 @@ test-trybuild-ui:
   script:
     - cargo test --no-default-features --features full --tests -- --ignored
   cache:
-    key: cargo-1-49-all
+    key: cargo-1-50-all
     paths:
       - cargo/
       - target/
@@ -81,8 +81,13 @@ readme:
 
 rustfmt:
   stage: test
-  image: iamsauravsharma/rust-fmt:nightly-alpine
+  image:
+    name: alpine:3.13
   before_script:
+    - apk add rustup
+    - rustup-init -qy --default-host x86_64-unknown-linux-musl --default-toolchain none </dev/null
+    - source $CARGO_HOME/env
+    - rustup toolchain install nightly --profile minimal --component rustfmt
     - cargo -V
     - cargo fmt --version
   script:
diff --git a/rustfmt.toml b/rustfmt.toml
index 627d9e1..1cd0ec8 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -13,7 +13,7 @@ trailing_comma = "Never"
 
 # misc
 format_code_in_doc_comments = true
-merge_imports = true
+imports_granularity = "Crate"
 overflow_delimited_expr = true
 use_field_init_shorthand = true
 use_try_shorthand = true