Skip to content

Commit

Permalink
Merge pull request #854 from mkroening/nightly-2023-08-15
Browse files Browse the repository at this point in the history
build: upgrade Rust to nightly-2023-08-15
  • Loading branch information
mkroening authored Aug 22, 2023
2 parents 2625dfc + eb74459 commit d35e449
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/fd/socket/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ impl<T> Socket<T> {
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<isize, i32> {
future::poll_fn(|cx| {
self.with(|socket| {
Expand Down
8 changes: 5 additions & 3 deletions xtask/src/archive.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::env;
use std::fmt::Write;
use std::path::{Path, PathBuf};

use anyhow::{anyhow, Result};
Expand Down Expand Up @@ -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::<String>();
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)?;
Expand Down

0 comments on commit d35e449

Please sign in to comment.