Move command-specific code into crate::command module

.github/configs/skywalking-eyes.yml

@@ -8,4 +8,4 @@ header:
   paths:
     - "src/**/*.rs"
   paths-ignore:
-    - "src/dependencies/cycles/tri_color.rs"
+    - "src/command/dependencies/cycles/tri_color.rs"

src/command.rs

@@ -6,12 +6,18 @@ use clap::Parser;
 
 use crate::{
     analyzer::{load_workspace, LoadOptions},
-    dependencies::command::Command as DependenciesCommand,
     options::{general::Options as GeneralOptions, project::Options as ProjectOptions},
-    orphans::command::Command as OrphansCommand,
-    structure::command::Command as StructureCommand,
 };
 
+use self::{
+    dependencies::command::Command as DependenciesCommand,
+    orphans::command::Command as OrphansCommand, structure::command::Command as StructureCommand,
+};
+
+pub mod dependencies;
+pub mod orphans;
+pub mod structure;
+
 #[derive(Parser, Clone, PartialEq, Eq, Debug)]
 #[command(
     name = "cargo-modules",

src/dependencies/builder.rs → src/command/dependencies/builder.rs

@@ -13,12 +13,11 @@ use ra_ap_hir_ty::{self as hir_ty, db::HirDatabase as _, TyExt as _};
 use ra_ap_ide_db::{self as ide_db};
 use scopeguard::defer;
 
-use crate::{
-    dependencies::{
-        graph::{Edge, EdgeKind, Graph, Node},
-        options::Options,
-    },
-    item::Item,
+use crate::item::Item;
+
+use super::{
+    graph::{Edge, EdgeKind, Graph, Node},
+    options::Options,
 };
 
 #[derive(Debug, Hash, Eq, PartialEq)]

src/dependencies/command.rs → src/command/dependencies/command.rs

@@ -8,16 +8,15 @@ use petgraph::graph::NodeIndex;
 use ra_ap_hir as hir;
 use ra_ap_ide::RootDatabase;
 
-use crate::{
-    analyzer::LoadOptions,
-    dependencies::{
-        builder::Builder,
-        cycles::tri_color::{CycleDetector, TriColorDepthFirstSearch},
-        filter::Filter,
-        graph::Graph,
-        options::{LayoutAlgorithm, Options},
-        printer::Printer,
-    },
+use crate::analyzer::LoadOptions;
+
+use super::{
+    builder::Builder,
+    cycles::tri_color::{CycleDetector, TriColorDepthFirstSearch},
+    filter::Filter,
+    graph::Graph,
+    options::{LayoutAlgorithm, Options},
+    printer::Printer,
 };
 
 #[derive(Parser, Clone, PartialEq, Eq, Debug)]

src/dependencies/cycles/tri_color.rs → src/command/dependencies/cycles/tri_color.rs

@@ -20,7 +20,7 @@ use std::{marker::PhantomData, ops::ControlFlow};
 use bitvec::vec::BitVec;
 use petgraph::graph::{IndexType, NodeIndex};
 
-use crate::dependencies::graph::Graph as G;
+use super::super::graph::Graph as G;
 
 struct BitSet<T> {
     vec: BitVec,

src/dependencies/filter.rs → src/command/dependencies/filter.rs

@@ -15,13 +15,12 @@ use ra_ap_hir::{self as hir};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_syntax::ast;
 
-use crate::{
-    analyzer,
-    dependencies::{
-        graph::{Edge, EdgeKind, Graph},
-        options::Options,
-        walker::GraphWalker,
-    },
+use crate::analyzer;
+
+use super::{
+    graph::{Edge, EdgeKind, Graph},
+    options::Options,
+    walker::GraphWalker,
 };
 
 #[derive(Debug)]

src/dependencies/printer.rs → src/command/dependencies/printer.rs

@@ -13,14 +13,12 @@ use petgraph::{
 use ra_ap_hir as hir;
 use ra_ap_ide::RootDatabase;
 
-use crate::{
-    analyzer,
-    dependencies::{
-        graph::{Edge, EdgeKind, Graph, Node},
-        options::Options,
-        theme::{edge_styles, node_styles},
-    },
-    item::visibility::ItemVisibility,
+use crate::{analyzer, item::visibility::ItemVisibility};
+
+use super::{
+    graph::{Edge, EdgeKind, Graph, Node},
+    options::Options,
+    theme::{edge_styles, node_styles},
 };
 
 const INDENTATION: &str = "    ";

src/orphans/command.rs → src/command/orphans/command.rs

@@ -8,10 +8,9 @@ use ra_ap_hir as hir;
 use ra_ap_ide::RootDatabase;
 use ra_ap_vfs::Vfs;
 
-use crate::{
-    analyzer::{self, LoadOptions},
-    orphans::{options::Options, printer::Printer},
-};
+use crate::analyzer::{self, LoadOptions};
+
+use super::{options::Options, printer::Printer};
 
 use super::scanner::Scanner;
 

src/orphans/printer.rs → src/command/orphans/printer.rs

@@ -6,10 +6,7 @@
 
 use ra_ap_ide::RootDatabase;
 
-use crate::{
-    orphans::orphan::Orphan,
-    orphans::{options::Options, theme::styles},
-};
+use super::{options::Options, orphan::Orphan, theme::styles};
 
 pub struct Printer<'a> {
     #[allow(dead_code)]

src/orphans/scanner.rs → src/command/orphans/scanner.rs

@@ -14,7 +14,9 @@ use ra_ap_hir::{self as hir, Crate};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_vfs::Vfs;
 
-use crate::{analyzer, orphans::orphan::Orphan};
+use crate::analyzer;
+
+use super::orphan::Orphan;
 
 #[derive(Debug)]
 pub struct Scanner<'a> {

src/structure/builder.rs → src/command/structure/builder.rs

@@ -8,10 +8,9 @@ use ra_ap_hir::{self as hir, Crate};
 use ra_ap_ide_db::RootDatabase;
 use scopeguard::defer;
 
-use crate::{
-    item::Item,
-    structure::{options::Options, tree::Tree},
-};
+use crate::item::Item;
+
+use super::{options::Options, tree::Tree};
 
 #[derive(Debug)]
 pub struct Builder<'a> {

src/structure/command.rs → src/command/structure/command.rs

@@ -9,10 +9,9 @@ use log::trace;
 use ra_ap_hir as hir;
 use ra_ap_ide::RootDatabase;
 
-use crate::{
-    analyzer::LoadOptions,
-    structure::{builder::Builder, filter::Filter, options::Options, printer::Printer},
-};
+use crate::analyzer::LoadOptions;
+
+use super::{builder::Builder, filter::Filter, options::Options, printer::Printer};
 
 #[derive(Parser, Clone, PartialEq, Eq, Debug)]
 pub struct Command {

src/structure/filter.rs → src/command/structure/filter.rs

@@ -6,10 +6,9 @@ use ra_ap_hir::{self as hir};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_syntax::ast;
 
-use crate::{
-    analyzer,
-    structure::{options::Options, tree::Tree},
-};
+use crate::analyzer;
+
+use super::{options::Options, tree::Tree};
 
 #[derive(Debug)]
 pub struct Filter<'a> {

src/structure/printer.rs → src/command/structure/printer.rs

@@ -8,14 +8,12 @@ use std::fmt;
 
 use ra_ap_ide::RootDatabase;
 
-use crate::{
-    analyzer,
-    item::visibility::ItemVisibility,
-    structure::{
-        options::{Options, SortBy},
-        theme::styles,
-        tree::Tree,
-    },
+use crate::{analyzer, item::visibility::ItemVisibility};
+
+use super::{
+    options::{Options, SortBy},
+    theme::styles,
+    tree::Tree,
 };
 
 #[derive(Debug)]

src/lib.rs

@@ -5,10 +5,6 @@
 pub mod command;
 pub mod options;
 
-pub mod dependencies;
-pub mod orphans;
-pub mod structure;
-
 pub(crate) mod analyzer;
 pub(crate) mod colors;
 pub(crate) mod item;