Moved everything in dcb_drv::new to root.

dcb-drv/src/cursor.rs

@@ -7,8 +7,8 @@ pub mod error;
 pub use error::{NewError, OpenFileError};
 
 // Imports
-use crate::new::{
-	ptr::{DirPtr, FilePtr},
+use crate::{
+	DirPtr, FilePtr,
 	DirEntry, DirEntryKind,
 };
 use bit_vec::BitVec;

dcb-drv/src/cursor/error.rs

@@ -1,7 +1,7 @@
 //! Errors
 
 // Imports
-use crate::new::ptr::{FileCursorError, ReadEntriesError, ReadEntryError};
+use crate::ptr::{FileCursorError, ReadEntriesError, ReadEntryError};
 use std::io;
 
 /// Error for [`DrvFsCursor::new`](super::DrvFsCursor::new)

dcb-drv/src/lib.rs

@@ -60,14 +60,17 @@
 // Modules
 pub mod cursor;
 pub mod dir;
+pub mod entry;
 pub mod error;
 pub mod file;
-pub mod new;
+pub mod ptr;
 
 // Exports
 pub use dir::{DirEntryWriter, DirWriter, DirWriterLister};
+pub use entry::{DirEntry, DirEntryKind};
 pub use error::WriteFsError;
 pub use file::FileWriter;
+pub use ptr::{DirPtr, FilePtr};
 
 // Imports
 use std::io;

dcb-drv/src/new.rs

@@ -1,8 +0,0 @@
-//!
-
-// Modules
-pub mod entry;
-pub mod ptr;
-
-// Exports
-pub use entry::{DirEntry, DirEntryKind};

dcb-drv/src/ptr/error.rs

@@ -28,5 +28,5 @@ pub enum ReadEntryError {
 
 	/// Unable to parse entry
 	#[error("Unable to parse entry")]
-	ParseEntry(#[source] crate::new::entry::FromBytesError),
+	ParseEntry(#[source] crate::entry::FromBytesError),
 }

dcb-tools/dcb-undrv/src/main.rs

@@ -6,7 +6,7 @@ mod cli;
 // Imports
 use anyhow::Context;
 use cli::CliData;
-use dcb_drv::new::{ptr::DirPtr, DirEntryKind};
+use dcb_drv::{DirEntryKind, DirPtr};
 use std::{
 	fs, io,
 	path::{Path, PathBuf},