Skip to content

Commit

Permalink
Merge pull request #451 from mkroening/nightly-2023-08-01
Browse files Browse the repository at this point in the history
Upgrade toolchain to `nightly-2023-08-01`
  • Loading branch information
mkroening authored Aug 8, 2023
2 parents 6bb8b95 + 475799d commit 659e874
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 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-07-15 \
RUST_VERSION=nightly-2023-08-01 \
RUST_COMPONENTS="rust-src"

RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion benches/netbench/src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub fn receive_message(n_bytes: usize, stream: &mut TcpStream, rbuf: &mut [u8])
}

/// Setup the streams and eventually pins the thread according to the configuration.
pub fn setup(config: &Config, stream: &mut TcpStream) {
pub fn setup(config: &Config, stream: &TcpStream) {
if config.no_delay {
stream
.set_nodelay(true)
Expand Down
2 changes: 1 addition & 1 deletion benches/netbench/src/rust-tcp-bw/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fn main() {
let n_bytes = args.n_bytes;

if let Ok(mut stream) = connection::client_connect(args.address_and_port()) {
connection::setup(&args, &mut stream);
connection::setup(&args, &stream);
println!("Connection established! Ready to send...");

// Create a buffer of 0s, size n_bytes, to be sent over multiple times
Expand Down
2 changes: 1 addition & 1 deletion benches/netbench/src/rust-tcp-bw/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn main() {
let mut buf = vec![0; n_bytes];

let mut stream = connection::server_listen_and_get_first_connection(&args.port.to_string());
connection::setup(&args, &mut stream);
connection::setup(&args, &stream);

let start = Instant::now();
for _i in 0..args.n_rounds {
Expand Down
2 changes: 1 addition & 1 deletion benches/netbench/src/rust-tcp-latency/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn main() {
while !connected {
match connection::client_connect(args.address_and_port()) {
Ok(mut stream) => {
connection::setup(&args, &mut stream);
connection::setup(&args, &stream);
threading::setup(&args);
connected = true;
let mut hist = hdrhist::HDRHist::new();
Expand Down
2 changes: 1 addition & 1 deletion benches/netbench/src/rust-tcp-latency/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn main() {
let mut buf = vec![0; n_bytes];

let mut stream = connection::server_listen_and_get_first_connection(&args.port.to_string());
connection::setup(&args, &mut stream);
connection::setup(&args, &stream);
threading::setup(&args);

// Make sure n_rounds is the same between client and server
Expand Down
2 changes: 1 addition & 1 deletion libhermit-rs
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
# Manually sync this with Dockerfile!
channel = "nightly-2023-07-15"
channel = "nightly-2023-08-01"
components = [ "rust-src" ]

0 comments on commit 659e874

Please sign in to comment.