Merge #382

382: Minimize rust-toolchain.toml r=mkroening a=mkroening



Co-authored-by: Martin Kröning <mkroening@posteo.net>

.github/workflows/ci.yml

@@ -21,6 +21,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
+      - run: rustup component add clippy
       - name: Install NASM
         run: |
           sudo apt-get update
@@ -33,6 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - run: rustup component add rustfmt
       - name: Format
         run: cargo fmt -- --check
 

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="rust-src"
 
 RUN set -eux; \
     dpkgArch="$(dpkg --print-architecture)"; \

rust-toolchain.toml

 [toolchain]
 # Manually sync this with Dockerfile!
 channel = "nightly-2022-10-19"
-components = [
-    "clippy",
-    "llvm-tools-preview",
-    "rustfmt",
-    "rust-src",
-]
-targets = [ "x86_64-unknown-hermit" ]
+components = [ "rust-src" ]