Merge #429

429: Upgrade rust toolchain to nightly-2022-04-24 r=mkroening a=mkroening



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

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-03-30 \
+    RUST_VERSION=nightly-2022-04-24 \
     RUST_COMPONENTS="clippy llvm-tools-preview rustfmt rust-src"
 
 RUN set -eux; \

rust-toolchain.toml

 [toolchain]
 # Manually sync this with Dockerfile!
-channel = "nightly-2022-03-30"
+channel = "nightly-2022-04-24"
 components = [
     "clippy",
     "llvm-tools-preview",

src/syscalls/tasks.rs

@@ -95,8 +95,8 @@ extern "C" fn __sys_sbrk(incr: isize) -> usize {
 		old_end = SBRK_COUNTER.fetch_add(incr as usize, Ordering::SeqCst);
 		assert!(task_heap_end.as_usize() >= old_end + incr as usize);
 	} else {
-		old_end = SBRK_COUNTER.fetch_sub(incr.abs() as usize, Ordering::SeqCst);
-		assert!(task_heap_start.as_usize() < old_end - incr.abs() as usize);
+		old_end = SBRK_COUNTER.fetch_sub(incr.unsigned_abs(), Ordering::SeqCst);
+		assert!(task_heap_start.as_usize() < old_end - incr.unsigned_abs());
 	}
 
 	old_end

xtask/src/main.rs

@@ -224,6 +224,7 @@ impl flags::Clippy {
 
 		// TODO: Enable clippy for aarch64
 		// https://github.com/hermitcore/libhermit-rs/issues/381
+		#[allow(clippy::single_element_loop)]
 		for target in ["x86_64"] {
 			let target_arg = target_arg(target)?;
 			cmd!(sh, "cargo clippy {KERNEL_CARGO_ARGS...} {target_arg}").run()?;