1 files changed, 34 insertions, 4 deletions

diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index e6334cf56..ca9275cd4 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -12,6 +12,22 @@ use ra_syntax::{AstNode, SourceFile};
 
 type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
 
+#[derive(Clone, Copy)]
+pub enum Verbosity {
+    Verbose,
+    Normal,
+    Quiet,
+}
+
+impl Verbosity {
+    fn is_verbose(&self) -> bool {
+        match self {
+            Verbosity::Verbose => true,
+            _ => false,
+        }
+    }
+}
+
 fn main() -> Result<()> {
     Logger::with_env().start()?;
 
@@ -67,13 +83,27 @@ fn main() -> Result<()> {
                 eprintln!("{}", help::ANALYSIS_STATS_HELP);
                 return Ok(());
             }
-            let verbose = matches.contains(["-v", "--verbose"]);
+            let verbosity = match (
+                matches.contains(["-v", "--verbose"]),
+                matches.contains(["-q", "--quiet"]),
+            ) {
+                (false, false) => Verbosity::Normal,
+                (false, true) => Verbosity::Quiet,
+                (true, false) => Verbosity::Verbose,
+                (true, true) => Err("Invalid flags: -q conflicts with -v")?,
+            };
             let memory_usage = matches.contains("--memory-usage");
-            let path: String = matches.value_from_str("--path")?.unwrap_or_default();
             let only = matches.value_from_str(["-o", "--only"])?.map(|v: String| v.to_owned());
-            matches.finish().or_else(handle_extra_flags)?;
+            let path = {
+                let mut trailing = matches.free()?;
+                if trailing.len() != 1 {
+                    eprintln!("{}", help::ANALYSIS_STATS_HELP);
+                    Err("Invalid flags")?;
+                }
+                trailing.pop().unwrap()
+            };
             analysis_stats::run(
-                verbose,
+                verbosity,
                 memory_usage,
                 path.as_ref(),
                 only.as_ref().map(String::as_ref),