Merge branch 'nickez/fix-vendor-script'

Author: NickeZ

.containerversion

@@ -1 +1 @@
-53
+54

Dockerfile

@@ -126,13 +126,8 @@ ENV PATH=/opt/lcov-1.14/bin:$PATH
 # Install rust compiler
 ENV PATH=/opt/cargo/bin:$PATH
 ENV RUSTUP_HOME=/opt/rustup
-COPY src/rust/rust-toolchain.toml /tmp/rust-toolchain.toml
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --default-toolchain $(grep -oP '(?<=channel = ")[^"]+' /tmp/rust-toolchain.toml) -y
-RUN rustup target add thumbv7em-none-eabi
-RUN rustup target add thumbv8m.main-none-eabihf
-RUN rustup component add rustfmt
-RUN rustup component add clippy
-RUN rustup component add rust-src
+COPY src/rust/rust-toolchain.toml rust-toolchain.toml
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --default-toolchain $(grep -oP '(?<=channel = ")[^"]+' rust-toolchain.toml) -y
 RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.29.2 --locked
 RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.72.1 --locked
 

Makefile

@@ -191,4 +191,4 @@ clean:
 
 # When you vendor rust libs avoid duplicates
 vendor-rust-deps:
-	(cd external; ./vendor-rust.sh)
+	./external/vendor-rust.sh

external/vendor-rust.sh

@@ -2,8 +2,9 @@
 #
 # Script for vendoring our dependencies, including the deps of core/alloc.
 #
-# This script must be called from the <git-project-root>/src/rust directory. It will place the
-# dependencies in a directory called "vendor" in the current working directory.
+# This script can be called from any directory. It runs Cargo from the
+# <git-project-root>/src/rust directory so rustup loads rust-toolchain.toml, and places the
+# dependencies in <git-project-root>/external/vendor.
 #
 # For some reason Cargo needs to find the dependencies of all rust std libs. Since "test" depends
 # on all the other ones, we take the toml-file from it. This means that we vendor libs that we
@@ -15,9 +16,16 @@
 # Copying the Cargo.lock file in the rust sysroot image requires root permissions. Therefore it is
 # done in the Dockerfile in our setup.
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+RUST_WORKSPACE_DIR="$REPO_ROOT/src/rust"
+VENDOR_DIR="../../external/vendor"
+
+cd "$RUST_WORKSPACE_DIR"
+
 RUST_SYSROOT="$(rustc --print=sysroot)"
 
 RUSTC_BOOTSTRAP=1 cargo vendor \
-    --manifest-path ../src/rust/Cargo.toml \
+    --manifest-path Cargo.toml \
     --sync "$RUST_SYSROOT/lib/rustlib/src/rust/library/test/Cargo.toml" \
-    vendor
+    "$VENDOR_DIR"

src/rust/rust-toolchain.toml

@@ -1,2 +1,5 @@
 [toolchain]
 channel = "1.93.1"
+components = ["clippy", "rust-analyzer", "rust-src", "rustfmt"]
+targets = ["thumbv7em-none-eabi", "thumbv8m.main-none-eabihf"]
+profile = "minimal"