Extract modules crate::command::structure::{tree,builder} to `crate…

…::tree`

src/command/structure.rs

@@ -4,9 +4,7 @@
 
 pub mod options;
 
-pub(crate) mod builder;
 pub(super) mod command;
 pub(super) mod filter;
 pub(crate) mod printer;
 pub(super) mod theme;
-pub(super) mod tree;

src/command/structure/command.rs

@@ -9,9 +9,9 @@ use log::trace;
 use ra_ap_hir as hir;
 use ra_ap_ide::RootDatabase;
 
-use crate::analyzer::LoadOptions;
+use crate::{analyzer::LoadOptions, tree::TreeBuilder};
 
-use super::{builder::Builder, filter::Filter, options::Options, printer::Printer};
+use super::{filter::Filter, options::Options, printer::Printer};
 
 #[derive(Parser, Clone, PartialEq, Eq, Debug)]
 pub struct Command {
@@ -30,7 +30,7 @@ impl Command {
     pub fn run(self, krate: hir::Crate, db: &RootDatabase) -> anyhow::Result<()> {
         trace!("Building tree ...");
 
-        let builder = Builder::new(&self.options, db, krate);
+        let builder = TreeBuilder::new(db, krate);
         let tree = builder.build()?;
 
         trace!("Filtering tree ...");

src/command/structure/filter.rs

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

src/command/structure/printer.rs

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

src/lib.rs

@@ -8,3 +8,4 @@ pub mod options;
 pub(crate) mod analyzer;
 pub(crate) mod colors;
 pub(crate) mod item;
+pub(crate) mod tree;

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

@@ -4,6 +4,10 @@
 
 use crate::item::Item;
 
+mod builder;
+
+pub(crate) use self::builder::TreeBuilder;
+
 #[derive(Clone, PartialEq, Debug)]
 pub struct Tree {
     pub item: Item,

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

@@ -8,21 +8,17 @@ use ra_ap_hir::{self as hir, Crate};
 use ra_ap_ide_db::RootDatabase;
 use scopeguard::defer;
 
-use crate::item::Item;
-
-use super::{options::Options, tree::Tree};
+use crate::{item::Item, tree::Tree};
 
 #[derive(Debug)]
-pub struct Builder<'a> {
-    #[allow(dead_code)]
-    options: &'a Options,
+pub struct TreeBuilder<'a> {
     db: &'a RootDatabase,
     krate: hir::Crate,
 }
 
-impl<'a> Builder<'a> {
-    pub fn new(options: &'a Options, db: &'a RootDatabase, krate: hir::Crate) -> Self {
-        Self { options, db, krate }
+impl<'a> TreeBuilder<'a> {
+    pub fn new(db: &'a RootDatabase, krate: hir::Crate) -> Self {
+        Self { db, krate }
     }
 
     pub fn build(mut self) -> anyhow::Result<Tree> {