Towards rust-lang#653

Change the `verbose` attribute of a shell from a `bool` to a `Verbosity`
enum, which has `Verbose`, `Normal`, and `Quiet` variants.

Author: pwoolcoc

src/cargo/core/mod.rs

@@ -5,7 +5,7 @@ pub use self::package_id::PackageId;
 pub use self::package_id_spec::PackageIdSpec;
 pub use self::registry::Registry;
 pub use self::resolver::Resolve;
-pub use self::shell::{Shell, MultiShell, ShellConfig};
+pub use self::shell::{Shell, MultiShell, ShellConfig, Verbosity};
 pub use self::source::{Source, SourceId, SourceMap, SourceSet};
 pub use self::summary::Summary;
 

src/cargo/core/shell.rs

@@ -4,9 +4,15 @@ use term::attr::{Attr, Bold};
 use std::io::{IoResult, stderr};
 use std::fmt::Show;
 
+pub enum Verbosity {
+    Verbose,
+    Normal,
+    Quiet
+}
+
 pub struct ShellConfig {
     pub color: bool,
-    pub verbose: bool,
+    pub verbosity: Verbosity,
     pub tty: bool
 }
 
@@ -23,7 +29,7 @@ pub struct Shell {
 pub struct MultiShell {
     out: Shell,
     err: Shell,
-    verbose: bool
+    verbose: Verbosity
 }
 
 pub type Callback<'a> = |&mut MultiShell|:'a -> IoResult<()>;
@@ -33,8 +39,8 @@ struct UghWhyIsThisNecessary {
 }
 
 impl MultiShell {
-    pub fn new(out: Shell, err: Shell, verbose: bool) -> MultiShell {
-        MultiShell { out: out, err: err, verbose: verbose }
+    pub fn new(out: Shell, err: Shell, verbosity: Verbosity) -> MultiShell {
+        MultiShell { out: out, err: err, verbosity: verbosity }
     }
 
     pub fn out(&mut self) -> &mut Shell {
@@ -54,13 +60,17 @@ impl MultiShell {
     }
 
     pub fn verbose(&mut self, callback: Callback) -> IoResult<()> {
-        if self.verbose { return callback(self) }
-        Ok(())
+        match self.verbosity {
+            Verbose => return callback(self),
+            _ => Ok(())
+        }
     }
 
     pub fn concise(&mut self, callback: Callback) -> IoResult<()> {
-        if !self.verbose { return callback(self) }
-        Ok(())
+        match self.verbosity {
+            Verbose => Ok(()),
+            _ => return callback(self)
+        }
     }
 
     pub fn error<T: ToString>(&mut self, message: T) -> IoResult<()> {
@@ -71,8 +81,17 @@ impl MultiShell {
         self.err().say(message, YELLOW)
     }
 
+    pub fn set_verbosity(&mut self, verbosity: Verbosity) {
+        self.verbosity = verbosity;
+    }
+
+    /// shortcut for commands that don't have both --verbose and --quiet
     pub fn set_verbose(&mut self, verbose: bool) {
-        self.verbose = verbose;
+        if verbose {
+            self.verbosity = Verbose;
+        } else {
+            self.verbosity = Normal;
+        }
     }
 }
 
@@ -95,13 +114,17 @@ impl Shell {
     }
 
     pub fn verbose(&mut self, callback: ShellCallback) -> IoResult<()> {
-        if self.config.verbose { return callback(self) }
-        Ok(())
+        match self.config.verbosity {
+            Verbose => return callback(self),
+            _ => Ok(())
+        }
     }
 
     pub fn concise(&mut self, callback: ShellCallback) -> IoResult<()> {
-        if !self.config.verbose { return callback(self) }
-        Ok(())
+        match self.config.verbosity {
+            Verbose => Ok(()),
+            _ => return callback(self)
+        }
     }
 
     pub fn say<T: ToString>(&mut self, message: T, color: Color) -> IoResult<()> {

src/cargo/lib.rs

@@ -32,7 +32,8 @@ use std::io::{mod, stdout, stderr};
 use serialize::{Decoder, Encoder, Decodable, Encodable, json};
 use docopt::Docopt;
 
-use core::{Shell, MultiShell, ShellConfig};
+use core::{Shell, MultiShell, ShellConfig, Verbosity};
+use core::shell::{Verbose};
 use term::color::{BLACK};
 
 pub use util::{CargoError, CliError, CliResult, human};
@@ -131,7 +132,7 @@ pub fn call_main_without_stdin<'a,
 
 fn process<'a, V: Encodable<json::Encoder<'a>, io::IoError>>(
                callback: |&[String], &mut MultiShell| -> CliResult<Option<V>>) {
-    let mut shell = shell(true);
+    let mut shell = shell(Verbose);
     process_executed(callback(os::args().as_slice(), &mut shell), &mut shell)
 }
 
@@ -149,20 +150,20 @@ pub fn process_executed<'a,
     }
 }
 
-pub fn shell(verbose: bool) -> MultiShell {
+pub fn shell(verbosity: Verbosity) -> MultiShell {
     let tty = stderr_raw().isatty();
     let stderr = box stderr() as Box<Writer + Send>;
 
-    let config = ShellConfig { color: true, verbose: verbose, tty: tty };
+    let config = ShellConfig { color: true, verbosity: verbosity, tty: tty };
     let err = Shell::create(stderr, config);
 
     let tty = stdout_raw().isatty();
     let stdout = box stdout() as Box<Writer + Send>;
 
-    let config = ShellConfig { color: true, verbose: verbose, tty: tty };
+    let config = ShellConfig { color: true, verbosity: verbosity, tty: tty };
     let out = Shell::create(stdout, config);
 
-    MultiShell::new(out, err, verbose)
+    MultiShell::new(out, err, verbosity)
 }
 
 pub fn handle_error(err: CliError, shell: &mut MultiShell) {