Merge pull request #41 from Nemo157/rearrange

Rearrange modules

Author: Nemo157

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "roaring"
-version = "0.4.2"
+version = "0.5.0"
 authors = ["Wim Looman <[email protected]>"]
 description = "http://roaringbitmap.org : A better compressed bitset - pure Rust implementation "
 

src/cmp.rs renamed to src/bitmap/cmp.rs

@@ -2,7 +2,7 @@ use std::slice;
 use std::iter::Peekable;
 
 use RoaringBitmap;
-use container::Container;
+use super::container::Container;
 
 struct Pairs<'a>(Peekable<slice::Iter<'a, Container>>, Peekable<slice::Iter<'a, Container>>);
 

src/container.rs renamed to src/bitmap/container.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
-use util;
-use store::{ self, Store };
+use super::util;
+use super::store::{ self, Store };
 
 const ARRAY_LIMIT: u64 = 4096;
 

src/fmt.rs renamed to src/bitmap/fmt.rs

@@ -1,7 +1,7 @@
 use RoaringBitmap;
 
-use util;
-use container::Container;
+use super::util;
+use super::container::Container;
 
 impl RoaringBitmap {
     /// Creates an empty `RoaringBitmap`.

src/inherent.rs renamed to src/bitmap/inherent.rs

@@ -3,7 +3,7 @@ use std::slice;
 use std::vec;
 
 use RoaringBitmap;
-use container::Container;
+use super::container::Container;
 
 /// An iterator for `RoaringBitmap`.
 pub struct Iter<'a> {

src/iter.rs renamed to src/bitmap/iter.rs

@@ -0,0 +1,36 @@
+mod store;
+mod container;
+mod util;
+mod fmt;
+
+// Order of these modules matters as it determines the `impl` blocks order in
+// the docs
+mod inherent;
+mod iter;
+mod ops;
+mod cmp;
+mod serialization;
+
+pub use self::iter::Iter;
+pub use self::iter::IntoIter;
+
+/// A compressed bitmap using the [Roaring bitmap compression scheme](http://roaringbitmap.org).
+///
+/// # Examples
+///
+/// ```rust
+/// use roaring::RoaringBitmap;
+///
+/// let mut rb = RoaringBitmap::new();
+///
+/// // insert all primes less than 10
+/// rb.insert(2);
+/// rb.insert(3);
+/// rb.insert(5);
+/// rb.insert(7);
+/// println!("total bits set to true: {}", rb.len());
+/// ```
+#[derive(PartialEq, Clone)]
+pub struct RoaringBitmap {
+    containers: Vec<container::Container>,
+}

src/bitmap/mod.rs

@@ -2,8 +2,8 @@ use std::io;
 use byteorder::{ LittleEndian, ReadBytesExt, WriteBytesExt };
 
 use RoaringBitmap;
-use store::Store;
-use container::Container;
+use super::store::Store;
+use super::container::Container;
 
 const SERIAL_COOKIE_NO_RUNCONTAINER: u32 = 12346;
 const SERIAL_COOKIE: u16 = 12347;