Add a --quiet argument

Author: phil-opp

src/args.rs

@@ -47,6 +47,7 @@ where
     let mut cargo_args = Vec::new();
     let mut run_args = Vec::new();
     let mut run_args_started = false;
+    let mut quiet = false;
     {
         fn set<T>(arg: &mut Option<T>, value: Option<T>) -> Result<(), ErrorString> {
             let previous = mem::replace(arg, value);
@@ -69,6 +70,9 @@ where
                 "--version" => {
                     return Ok(Command::Version);
                 }
+                "--quiet" => {
+                    quiet = true;
+                }
                 "--bin" => {
                     let next = arg_iter.next();
                     set(&mut bin_name, next.clone())?;
@@ -142,6 +146,7 @@ where
         target,
         manifest_path,
         release: release.unwrap_or(false),
+        quiet,
     }))
 }
 
@@ -151,6 +156,8 @@ pub struct Args {
     pub cargo_args: Vec<String>,
     /// All arguments that are passed to the runner.
     pub run_args: Vec<String>,
+    /// Suppress any output to stdout.
+    pub quiet: bool,
     /// The manifest path (also present in `cargo_args`).
     manifest_path: Option<PathBuf>,
     /// The name of the binary (passed `--bin` argument) (also present in `cargo_args`).
@@ -207,6 +214,8 @@ where
     A: Iterator<Item = String>,
 {
     let mut executable = None;
+    let mut quiet = false;
+
     let mut arg_iter = args.into_iter().fuse();
 
     loop {
@@ -217,6 +226,9 @@ where
             Some("--version") => {
                 return Ok(Command::Version);
             }
+            Some("--quiet") => {
+                quiet = true;
+            }
             Some(exe) if executable.is_none() => {
                 let path = Path::new(exe);
                 let path_canonicalized = path.canonicalize().map_err(|err| {
@@ -235,11 +247,14 @@ where
 
     Ok(Command::Runner(RunnerArgs {
         executable: executable.ok_or("excepted path to kernel executable as first argument")?,
+        quiet,
     }))
 }
 
 #[derive(Debug, Clone)]
 pub struct RunnerArgs {
     pub executable: PathBuf,
+    /// Suppress any output to stdout.
+    pub quiet: bool,
 }
 

src/subcommand/build.rs

@@ -6,7 +6,8 @@ pub(crate) fn build(mut args: Args) -> Result<(), ErrorString> {
     let config = config::read_config(builder.kernel_manifest_path().to_owned())?;
     args.apply_default_target(&config, builder.kernel_root());
 
-    build_impl(&builder, &mut args, false).map(|_| ())
+    let quiet = args.quiet;
+    build_impl(&builder, &mut args, quiet).map(|_| ())
 }
 
 pub(crate) fn build_impl(

src/subcommand/run.rs

@@ -8,7 +8,8 @@ pub(crate) fn run(mut args: Args) -> Result<i32, ErrorString> {
     let config = config::read_config(builder.kernel_manifest_path().to_owned())?;
     args.apply_default_target(&config, builder.kernel_root());
 
-    let bootimages = build::build_impl(&builder, &mut args, false)?;
+    let quiet = args.quiet;
+    let bootimages = build::build_impl(&builder, &mut args, quiet)?;
     let bootimage_path = bootimages.first().ok_or("no bootimages created")?;
     if bootimages.len() > 1 {
         Err("more than one bootimage created")?;

src/subcommand/runner.rs

@@ -19,7 +19,7 @@ pub(crate) fn runner(args: RunnerArgs) -> Result<i32, ErrorString> {
         parent.join(format!("bootimage-{}.bin", file_stem))
     };
 
-    builder.create_bootimage(&args.executable, &bootimage_bin, false)?;
+    builder.create_bootimage(&args.executable, &bootimage_bin, args.quiet)?;
 
     let mut command = process::Command::new(&config.run_command[0]);
     for arg in &config.run_command[1..] {