From d1397aa38f28b2cb05950ac1cd282b90d267316c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 7 Aug 2023 10:09:11 +0200 Subject: [PATCH 1/3] Remove -preview tag from the llvm-tools component dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- Dockerfile | 2 +- rust-toolchain.toml | 2 +- xtask/src/archive.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 466b0041b3..90c2c60b98 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-2023-07-15 \ - RUST_COMPONENTS="llvm-tools-preview rust-src" \ + RUST_COMPONENTS="llvm-tools rust-src" \ RUST_TARGETS="x86_64-unknown-none" RUN set -eux; \ diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 2c8f8de18d..6d9ab7c0fd 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,7 +2,7 @@ # Manually sync this with Dockerfile! channel = "nightly-2023-07-15" components = [ - "llvm-tools-preview", + "llvm-tools", "rust-src", ] targets = [ "x86_64-unknown-none" ] diff --git a/xtask/src/archive.rs b/xtask/src/archive.rs index 38aa57c84a..e93c21f821 100644 --- a/xtask/src/archive.rs +++ b/xtask/src/archive.rs @@ -103,7 +103,7 @@ fn binutil(name: &str) -> Result { llvm_tools::Error::NotFound => anyhow!( "Could not find llvm-tools component\n\ \n\ - Maybe the rustup component `llvm-tools-preview` is missing? Install it through: `rustup component add llvm-tools-preview`" + Maybe the rustup component `llvm-tools` is missing? Install it through: `rustup component add llvm-tools`" ), err => anyhow!("{err:?}"), })? From ca2729310c2bbd2ce4c1ce30763b2059c0794cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 7 Aug 2023 10:17:21 +0200 Subject: [PATCH 2/3] Fix clippy::needless_pass_by_ref_mut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- src/drivers/virtio/virtqueue/packed.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/virtio/virtqueue/packed.rs b/src/drivers/virtio/virtqueue/packed.rs index e08c86ed10..736f3453b6 100644 --- a/src/drivers/virtio/virtqueue/packed.rs +++ b/src/drivers/virtio/virtqueue/packed.rs @@ -698,7 +698,7 @@ impl<'a> ReadCtrl<'a> { /// Updates the descriptor flags inside the actual ring if necessary and /// increments the poll_index by one. - fn update_send(&mut self, send_buff: &mut Buffer) { + fn update_send(&mut self, send_buff: &Buffer) { for _desc in send_buff.as_slice() { // Increase poll_index and reset ring position beforehand in order to have a consistent and clean // data structure. From 24bc7cc133ee773e2707b41aae840251c86aaa87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 7 Aug 2023 10:10:45 +0200 Subject: [PATCH 3/3] Upgrade toolchain to `nightly-2023-08-01` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- Dockerfile | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 90c2c60b98..a7f50a7277 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ # Manually sync this with rust-toolchain.toml! - RUST_VERSION=nightly-2023-07-15 \ + RUST_VERSION=nightly-2023-08-01 \ RUST_COMPONENTS="llvm-tools rust-src" \ RUST_TARGETS="x86_64-unknown-none" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6d9ab7c0fd..5e7d7bc074 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] # Manually sync this with Dockerfile! -channel = "nightly-2023-07-15" +channel = "nightly-2023-08-01" components = [ "llvm-tools", "rust-src",