From 6b3a9b8b4d572114d93dfcf2ebcbc88a8d89fdf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net>
Date: Fri, 18 Nov 2022 01:17:59 +0100
Subject: [PATCH] Don't install clippy, rustfmt by default
---
.github/workflows/ci.yml | 4 ++--
Dockerfile | 2 +-
rust-toolchain.toml | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a334b1604..7167fdc64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,8 +27,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install nasm
- - name: Apply rust-toolchain.toml
- run: rustup show
+ - run: rustup component add clippy
- uses: Swatinem/rust-cache@v2
- run: cargo xtask clippy
@@ -37,6 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
+ - run: rustup component add rustfmt
- run: cargo fmt -- --check
check-docs:
diff --git a/Dockerfile b/Dockerfile
index 477e6a4bc..71a374bf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH \
# Manually sync this with rust-toolchain.toml!
RUST_VERSION=nightly-2022-10-19 \
- RUST_COMPONENTS="clippy llvm-tools-preview rustfmt rust-src" \
+ RUST_COMPONENTS="llvm-tools-preview rust-src" \
RUST_TARGETS="x86_64-unknown-none"
RUN set -eux; \
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 074062ab3..245b2a042 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,9 +2,7 @@
# Manually sync this with Dockerfile!
channel = "nightly-2022-10-19"
components = [
- "clippy",
"llvm-tools-preview",
- "rustfmt",
"rust-src",
]
targets = [ "x86_64-unknown-none" ]
--
GitLab