Renamed BlockDbg to Disassembler

Also some last module / namespace cleanups and changes for Block and Disassembler

src/main.rs

@@ -1,10 +1,11 @@
 mod vm;
 
-#[cfg(feature = "disassemble")]
-use crate::vm::block::disassemble::BlockDbg;
+use colored::Colorize;
 
 use crate::vm::block::{Block, OpCode};
-use colored::Colorize;
+
+#[cfg(feature = "disassemble")]
+use crate::vm::block::Disassembler;
 
 fn main() {
     println!(

src/vm/block/disassemble.rs

@@ -1,14 +1,14 @@
 use crate::vm::block::{Block, OpCode};
 use num_traits::FromPrimitive;
 
-pub trait BlockDbg {
+pub trait Disassembler {
     fn disassemble_block(&self);
     fn disassemble_instruction(&self, offset: usize, line: usize) -> usize;
     fn simple_instruction(&self, op_code: OpCode, offset: usize) -> usize;
     fn constant_instruction(&self, op_code: OpCode, offset: usize) -> usize;
 }
 
-impl BlockDbg for Block {
+impl Disassembler for Block {
     fn disassemble_block(&self) {
         println!();
         println!("=== <{}>  ===", self.name);

src/vm/block/mod.rs

@@ -1,8 +1,9 @@
-pub(crate) mod constants;
+mod constants;
+
 #[cfg(feature = "disassemble")]
-pub(crate) mod disassemble;
-#[cfg(test)]
-mod tests;
+mod disassemble;
+#[cfg(feature = "disassemble")]
+pub(crate) use crate::vm::block::disassemble::Disassembler;
 
 use crate::vm::block::constants::Constants;
 use enum_primitive_derive::Primitive;
@@ -86,3 +87,6 @@ impl Block {
         (byte4 << 24) | (byte3 << 16) | (byte2 << 8) | byte1
     }
 }
+
+#[cfg(test)]
+mod tests;