From 91710ba1a5465b0da62eb54193282d1daac3a71e Mon Sep 17 00:00:00 2001 From: Yifan Wu Date: Sun, 23 Jan 2022 01:41:55 -0800 Subject: [PATCH] Cargo fmt --- user/src/bin/infloop.rs | 1 + user/src/bin/until_timeout.rs | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/user/src/bin/infloop.rs b/user/src/bin/infloop.rs index 6e8964d5..1f248534 100644 --- a/user/src/bin/infloop.rs +++ b/user/src/bin/infloop.rs @@ -1,5 +1,6 @@ #![no_std] #![no_main] +#![allow(clippy::empty_loop)] extern crate user_lib; diff --git a/user/src/bin/until_timeout.rs b/user/src/bin/until_timeout.rs index 2a5c0529..a0007cb5 100644 --- a/user/src/bin/until_timeout.rs +++ b/user/src/bin/until_timeout.rs @@ -4,12 +4,14 @@ #[macro_use] extern crate user_lib; -use user_lib::{fork, exec, kill, waitpid_nb, waitpid, get_time, SignalFlags}; +use user_lib::{exec, fork, get_time, kill, waitpid, waitpid_nb, SignalFlags}; #[no_mangle] pub fn main(argc: usize, argv: &[&str]) -> i32 { assert_eq!(argc, 3, "argc must be 3!"); - let timeout_ms = argv[2].parse::().expect("Error when parsing timeout!"); + let timeout_ms = argv[2] + .parse::() + .expect("Error when parsing timeout!"); let pid = fork() as usize; if pid == 0 { if exec(argv[1], &[core::ptr::null::()]) != 0 { @@ -34,7 +36,7 @@ pub fn main(argc: usize, argv: &[&str]) -> i32 { } } if !child_exited { - println!("child has run for {}ms, kill it!", timeout_ms); + println!("child has run for {}ms, kill it!", timeout_ms); kill(pid, SignalFlags::SIGINT.bits()); assert_eq!(waitpid(pid, &mut exit_code) as usize, pid); println!("exit code of the child is {}", exit_code);