From e8a67b67bf87eb3119303e1e49f8c19b69d11461 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 10 Aug 2021 12:25:47 +0300
Subject: [PATCH] internal: prepare to use standard .run pattern for
 subcommands

---
 crates/rust-analyzer/src/bin/main.rs           | 3 +--
 crates/rust-analyzer/src/cli.rs                | 1 +
 crates/rust-analyzer/src/{bin => cli}/flags.rs | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename crates/rust-analyzer/src/{bin => cli}/flags.rs (98%)

diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index 97246cae6f0..c9e0951f829 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -1,7 +1,6 @@
 //! Driver for rust-analyzer.
 //!
 //! Based on cli flags, either spawns an LSP server, or runs a batch analysis
-mod flags;
 mod logger;
 mod rustc_wrapper;
 
@@ -10,7 +9,7 @@ use std::{convert::TryFrom, env, fs, path::Path, process};
 use lsp_server::Connection;
 use project_model::ProjectManifest;
 use rust_analyzer::{
-    cli::{self, AnalysisStatsCmd},
+    cli::{self, flags, AnalysisStatsCmd},
     config::Config,
     from_json,
     lsp_ext::supports_utf8,
diff --git a/crates/rust-analyzer/src/cli.rs b/crates/rust-analyzer/src/cli.rs
index 2f65a1dad07..00302616973 100644
--- a/crates/rust-analyzer/src/cli.rs
+++ b/crates/rust-analyzer/src/cli.rs
@@ -1,5 +1,6 @@
 //! Various batch processing tasks, intended primarily for debugging.
 
+pub mod flags;
 pub mod load_cargo;
 mod analysis_stats;
 mod diagnostics;
diff --git a/crates/rust-analyzer/src/bin/flags.rs b/crates/rust-analyzer/src/cli/flags.rs
similarity index 98%
rename from crates/rust-analyzer/src/bin/flags.rs
rename to crates/rust-analyzer/src/cli/flags.rs
index 19173241b28..f8babe4bc3d 100644
--- a/crates/rust-analyzer/src/bin/flags.rs
+++ b/crates/rust-analyzer/src/cli/flags.rs
@@ -3,7 +3,8 @@
 use std::path::PathBuf;
 
 use ide_ssr::{SsrPattern, SsrRule};
-use rust_analyzer::cli::Verbosity;
+
+use crate::cli::Verbosity;
 
 xflags::xflags! {
     src "./src/bin/flags.rs"
@@ -196,7 +197,7 @@ impl RustAnalyzer {
 // generated end
 
 impl RustAnalyzer {
-    pub(crate) fn verbosity(&self) -> Verbosity {
+    pub fn verbosity(&self) -> Verbosity {
         if self.quiet {
             return Verbosity::Quiet;
         }