Merge #387

387: Upgrade to nightly-2022-12-12 r=mkroening a=mkroening



Co-authored-by: Martin Kröning <mkroening@posteo.net>

Author: bors[bot]

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-2022-10-19 \
+    RUST_VERSION=nightly-2022-12-12 \
     RUST_COMPONENTS="rust-src"
 
 RUN set -eux; \

benches/netbench/src/connection.rs

@@ -16,7 +16,7 @@ pub fn send_message(n_bytes: usize, stream: &mut TcpStream, wbuf: &[u8]) {
 			Ok(n) => send += n,
 			Err(err) => match err.kind() {
 				WouldBlock => {}
-				_ => panic!("Error occurred while writing: {:?}", err),
+				_ => panic!("Error occurred while writing: {err:?}"),
 			},
 		}
 	}
@@ -32,7 +32,7 @@ pub fn receive_message(n_bytes: usize, stream: &mut TcpStream, rbuf: &mut [u8])
 			Ok(n) => recv += n,
 			Err(err) => match err.kind() {
 				WouldBlock => {}
-				_ => panic!("Error occurred while reading: {:?}", err),
+				_ => panic!("Error occurred while reading: {err:?}"),
 			},
 		}
 	}
@@ -65,10 +65,7 @@ pub fn close_connection(stream: &TcpStream) {
 /// Starts listening on given port and return first connection to that port as a stream.
 pub fn server_listen_and_get_first_connection(port: &str) -> TcpStream {
 	let listener = TcpListener::bind("0.0.0.0:".to_owned() + port).unwrap();
-	println!(
-		"Server running, listening for connection on 0.0.0.0:{}",
-		port
-	);
+	println!("Server running, listening for connection on 0.0.0.0:{port}");
 	let stream = listener.incoming().next().unwrap().unwrap();
 	println!(
 		"Connection established with {:?}!",

benches/netbench/src/print_utils.rs

@@ -15,6 +15,6 @@ pub fn print_summary(hist: hdrhist::HDRHist) {
 	print_line();
 	println!("CDF summary:\n");
 	for entry in hist.ccdf_upper_bound() {
-		println!("{:?}", entry);
+		println!("{entry:?}");
 	}
 }

benches/netbench/src/rust-tcp-bw/client.rs

@@ -28,7 +28,7 @@ fn main() {
 				let bytes_written = match stream.write(&buf[pos..]) {
 					Ok(len) => len,
 					Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => 0,
-					Err(e) => panic!("encountered IO error: {}", e),
+					Err(e) => panic!("encountered IO error: {e}"),
 				};
 				pos += bytes_written;
 			}

benches/netbench/src/rust-tcp-latency/client.rs

@@ -58,7 +58,7 @@ fn main() {
 				print_utils::print_summary(hist);
 			}
 			Err(error) => {
-				println!("Couldn't connect to server, retrying... Error {}", error);
+				println!("Couldn't connect to server, retrying... Error {error}");
 				thread::sleep(time::Duration::from_secs(1));
 			}
 		}

examples/demo/src/tests/mod.rs

@@ -54,7 +54,7 @@ pub fn pi_sequential(num_steps: u64) -> Result<(), ()> {
 	}
 
 	let mypi = sum * (1.0 / num_steps as f64);
-	println!("Pi: {} (sequential)", mypi);
+	println!("Pi: {mypi} (sequential)");
 
 	if (mypi - PI).abs() < 0.00001 {
 		Ok(())
@@ -82,7 +82,7 @@ pub fn pi_parallel(num_steps: u64) -> Result<(), ()> {
 	});
 
 	let mypi = sum * (1.0 / num_steps as f64);
-	println!("Pi: {} (with {} threads)", mypi, ncpus);
+	println!("Pi: {mypi} (with {ncpus} threads)");
 
 	if (mypi - PI).abs() < 0.00001 {
 		Ok(())
@@ -96,7 +96,7 @@ pub fn read_file() -> Result<(), std::io::Error> {
 	let mut contents = String::new();
 	file.read_to_string(&mut contents)?;
 
-	println!("Hostname: {}", contents);
+	println!("Hostname: {contents}");
 
 	Ok(())
 }
@@ -130,7 +130,7 @@ pub fn print_argv() -> Result<(), ()> {
 
 	// Prints each argument on a separate line
 	for (i, argument) in args.enumerate() {
-		println!("argument[{}] = {}", i, argument);
+		println!("argument[{i}] = {argument}");
 	}
 
 	Ok(())
@@ -142,7 +142,7 @@ pub fn print_env() -> Result<(), ()> {
 	// We will iterate through the references to the element returned by
 	// env::vars();
 	for (key, value) in envs {
-		println!("{}: {}", key, value);
+		println!("{key}: {value}");
 	}
 
 	Ok(())
@@ -169,7 +169,7 @@ pub fn arithmetic() -> Result<(), ()> {
 	let y: f64 = x.exp();
 	let z: f64 = y.log(E);
 
-	println!("x = {}, e^x = {}, ln(e^x) = {}", x, y, z);
+	println!("x = {x}, e^x = {y}, ln(e^x) = {z}");
 
 	Ok(())
 }
@@ -181,7 +181,7 @@ pub fn threading() -> Result<(), ()> {
 	for i in 0..2 {
 		// Spin up another thread
 		children.push(thread::spawn(move || {
-			println!("this is thread number {}", i);
+			println!("this is thread number {i}");
 		}));
 	}
 

libhermit-rs

@@ -1,4 +1,4 @@
 [toolchain]
 # Manually sync this with Dockerfile!
-channel = "nightly-2022-10-19"
+channel = "nightly-2022-12-12"
 components = [ "rust-src" ]