diff --git a/Dockerfile b/Dockerfile index a7f50a7277..5a078115a7 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-08-01 \ + RUST_VERSION=nightly-2023-08-15 \ RUST_COMPONENTS="llvm-tools rust-src" \ RUST_TARGETS="x86_64-unknown-none" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5e7d7bc074..dea6861614 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] # Manually sync this with Dockerfile! -channel = "nightly-2023-08-01" +channel = "nightly-2023-08-15" components = [ "llvm-tools", "rust-src", diff --git a/src/fd/socket/tcp.rs b/src/fd/socket/tcp.rs index 3574a05c15..eb68974ead 100644 --- a/src/fd/socket/tcp.rs +++ b/src/fd/socket/tcp.rs @@ -66,6 +66,9 @@ impl Socket { result } + // TODO: Remove allow once fixed: + // https://github.com/rust-lang/rust-clippy/issues/11380 + #[allow(clippy::needless_pass_by_ref_mut)] async fn async_read(&self, buffer: &mut [u8]) -> Result { future::poll_fn(|cx| { self.with(|socket| { diff --git a/xtask/src/archive.rs b/xtask/src/archive.rs index e93c21f821..32d03d13e5 100644 --- a/xtask/src/archive.rs +++ b/xtask/src/archive.rs @@ -1,4 +1,5 @@ use std::env; +use std::fmt::Write; use std::path::{Path, PathBuf}; use anyhow::{anyhow, Result}; @@ -45,9 +46,10 @@ impl Archive { let archive = self.as_ref(); let prefix = archive.file_stem().unwrap().to_str().unwrap(); - let symbol_renames = symbols - .map(|symbol| format!("{prefix}_{symbol} {symbol}\n")) - .collect::(); + let symbol_renames = symbols.fold(String::new(), |mut output, symbol| { + let _ = writeln!(output, "{prefix}_{symbol} {symbol}"); + output + }); let rename_path = archive.with_extension("redefine-syms"); sh.write_file(&rename_path, symbol_renames)?;