From 0bd3984b8595916848337ef013a3da41f7ba484a Mon Sep 17 00:00:00 2001
From: David Mehren <dmehren1@gmail.com>
Date: Fri, 13 Jul 2018 08:23:24 +0200
Subject: [PATCH] Move MinMax to common module Move Trees to root module
---
src/{trees => }/bp_tree.rs | 4 ++--
src/{datastructures => common}/min_max.rs | 2 +-
src/common/mod.rs | 1 +
src/datastructures/mod.rs | 1 -
src/lib.rs | 6 +++---
src/{trees => }/louds_tree.rs | 2 +-
src/trees/mod.rs | 2 --
7 files changed, 8 insertions(+), 10 deletions(-)
rename src/{trees => }/bp_tree.rs (99%)
rename src/{datastructures => common}/min_max.rs (99%)
delete mode 100644 src/datastructures/mod.rs
rename src/{trees => }/louds_tree.rs (99%)
delete mode 100644 src/trees/mod.rs
diff --git a/src/trees/bp_tree.rs b/src/bp_tree.rs
similarity index 99%
rename from src/trees/bp_tree.rs
rename to src/bp_tree.rs
index 233ea72..aeae375 100644
--- a/src/trees/bp_tree.rs
+++ b/src/bp_tree.rs
@@ -17,7 +17,7 @@
//! use bv::BitVec;
//! use bv::Bits;
//! use fp_succinct_trees_1::common::succinct_tree::SuccinctTree;
-//! use fp_succinct_trees_1::trees::bp_tree::BPTree;
+//! use fp_succinct_trees_1::bp_tree::BPTree;
//!
//! let bitvec = bit_vec!(true, true, false, false);
//! let tree: BPTree<i32> = BPTree::from_bitvec(bitvec.clone()).unwrap();
@@ -32,8 +32,8 @@ use bv::Bits;
use common::errors::EmptyTreeError;
use common::errors::InvalidBitvecError;
use common::errors::NodeError;
+use common::min_max::MinMax;
use common::succinct_tree::SuccinctTree;
-use datastructures::min_max::MinMax;
use failure::{Error, ResultExt};
use id_tree::Node;
use id_tree::NodeId;
diff --git a/src/datastructures/min_max.rs b/src/common/min_max.rs
similarity index 99%
rename from src/datastructures/min_max.rs
rename to src/common/min_max.rs
index 23dd670..7ce0edd 100644
--- a/src/datastructures/min_max.rs
+++ b/src/common/min_max.rs
@@ -15,7 +15,7 @@
//! # fn main() {
//! use bv::BitVec;
//! use bv::Bits;
-//! use fp_succinct_trees_1::datastructures::min_max::MinMax;
+//! use fp_succinct_trees_1::common::min_max::MinMax;
//!
//! let bits = bit_vec![true, false];
//! let min_max = MinMax::new(bits, 2);
diff --git a/src/common/mod.rs b/src/common/mod.rs
index eb9a593..d8c3510 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -1,2 +1,3 @@
pub mod errors;
+pub mod min_max;
pub mod succinct_tree;
diff --git a/src/datastructures/mod.rs b/src/datastructures/mod.rs
deleted file mode 100644
index cfc5d46..0000000
--- a/src/datastructures/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod min_max;
diff --git a/src/lib.rs b/src/lib.rs
index 9fbd488..e8d653b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,7 @@
// except according to those terms.
//! Succinct Tree library with implementations for the succinct trees LOUDS and BP
-//! and the Range-Min-Max data structure used by BP. LOUDS and BP also use the
+//! and the Range-Min-Max data structure used by BP. LOUDS and BP also use the
//! Rank/Select data structure from the Rust-Bio crate.
//! Code examples can be found in the submodules.
@@ -19,6 +19,6 @@ extern crate serde_derive;
extern crate bincode;
extern crate serde;
+pub mod bp_tree;
pub mod common;
-pub mod datastructures;
-pub mod trees;
+pub mod louds_tree;
diff --git a/src/trees/louds_tree.rs b/src/louds_tree.rs
similarity index 99%
rename from src/trees/louds_tree.rs
rename to src/louds_tree.rs
index ba7478c..814f424 100644
--- a/src/trees/louds_tree.rs
+++ b/src/louds_tree.rs
@@ -16,7 +16,7 @@
//! use bv::BitVec;
//! use bv::Bits;
//! use fp_succinct_trees_1::common::succinct_tree::SuccinctTree;
-//! use fp_succinct_trees_1::trees::louds_tree::LOUDSTree;
+//! use fp_succinct_trees_1::louds_tree::LOUDSTree;
//!
//! let bitvec = bit_vec![true, true, false, false];
//! let tree: LOUDSTree<i32> = LOUDSTree::from_bitvec(bitvec.clone()).unwrap();
diff --git a/src/trees/mod.rs b/src/trees/mod.rs
deleted file mode 100644
index bc27e16..0000000
--- a/src/trees/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod bp_tree;
-pub mod louds_tree;
--
GitLab