Cleanup top level modules

src/index/item.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-use crate::repository::ItemId;
+use crate::repository::{item::RepositoryItem, ItemId};
-use crate::{repository_item::RepositoryItem, version::Version};
+use crate::version::Version;
 
 #[derive(Clone, Debug, PartialOrd, PartialEq, Ord, Eq, Serialize, Deserialize)]
 pub struct IndexItem {

src/index/mod.rs

@@ -5,8 +5,8 @@ use std::path::Path;
 use serde::{Deserialize, Serialize};
 
 use crate::index::item::IndexItem;
-use crate::repository::ItemId;
+use crate::repository::{item::RepositoryItem, ItemId};
-use crate::{repository_item::RepositoryItem, version::Version};
+use crate::version::Version;
 use anyhow::Result;
 use anyhow::*;
 

src/lib.rs

@@ -1,10 +1,7 @@
 pub mod backup;
 pub mod repository;
 pub mod restore;
-pub mod source;
-
 pub mod test;
 
 mod index;
-mod repository_item;
 mod version;

src/repository/mod.rs

@@ -1,3 +1,5 @@
+pub mod item;
+
 use std::fmt::Formatter;
 use std::fs::File;
 use std::io::BufReader;
@@ -5,9 +7,9 @@ use std::path::{Path, PathBuf};
 use std::{fmt, fs, io};
 
 use crate::index::{Index, IndexItemIterator};
-use crate::repository_item::RepositoryItem;
 use anyhow::Result;
 use anyhow::*;
+use item::RepositoryItem;
 use serde::{Deserialize, Serialize};
 use sha2::Digest;
 use sha2::Sha512;

src/restore.rs

@@ -1,7 +1,6 @@
 use std::path::Path;
 
-use crate::repository::Repository;
+use crate::repository::{item::RepositoryItem, Repository};
-use crate::repository_item::RepositoryItem;
 use anyhow::Result;
 use anyhow::*;
 

src/test/assertions.rs

@@ -5,9 +5,8 @@ use std::path::Path;
 use tempfile::tempdir;
 use walkdir::WalkDir;
 
-use crate::repository::{ItemId, Repository};
+use super::source::TempSource;
-use crate::repository_item::RepositoryItem;
+use crate::repository::{item::RepositoryItem, ItemId, Repository};
-use crate::source::TempSource;
 use crate::{backup, restore};
 use anyhow::Result;
 

src/test/mod.rs

@@ -1 +1,2 @@
 pub mod assertions;
+pub mod source;

tests/concurrency_tests.rs

@@ -4,8 +4,7 @@ use std::path::Path;
 use anyhow::Result;
 use async_log::span;
 use bakare::repository::Repository;
-use bakare::source::TempSource;
+use bakare::test::{assertions::*, source::TempSource};
-use bakare::test::assertions::*;
 use bakare::{backup, restore};
 use nix::sys::wait::{waitpid, WaitStatus};
 use nix::unistd::{fork, getpid, ForkResult};

tests/system_tests.rs

@@ -3,8 +3,7 @@ use tempfile::tempdir;
 use anyhow::Result;
 use bakare::backup;
 use bakare::repository::Repository;
-use bakare::source::TempSource;
+use bakare::test::{assertions::*, source::TempSource};
-use bakare::test::assertions::*;
 
 #[test]
 fn restore_multiple_files() -> Result<()> {