rearrange modules

8 files changed, 25 insertions, 24 deletions

diff --git a/fuzz/atom/parser/gencorpus.rs b/fuzz/atom/parser/gencorpus.rs
index 67ba1e3..299835a 100644
--- a/fuzz/atom/parser/gencorpus.rs
+++ b/fuzz/atom/parser/gencorpus.rs
@@ -8,7 +8,7 @@ use std::{
 
 use gentoo_utils::{
     atom::Atom,
-    ebuild::{Depend, repo::Repo},
+    repo::{Repo, ebuild::Depend},
 };
 
 fn main() -> Result<(), Box<dyn Error>> {
diff --git a/fuzz/atom/vercmp/gencorpus.rs b/fuzz/atom/vercmp/gencorpus.rs
index 6d5eeef..6f96f4f 100644
--- a/fuzz/atom/vercmp/gencorpus.rs
+++ b/fuzz/atom/vercmp/gencorpus.rs
@@ -6,7 +6,7 @@ use std::{
     path::PathBuf,
 };
 
-use gentoo_utils::ebuild::repo::Repo;
+use gentoo_utils::repo::Repo;
 
 fn main() -> Result<(), Box<dyn Error>> {
     let corpus_dir = PathBuf::from(
diff --git a/src/atom/mod.rs b/src/atom/mod.rs
index 0b31223..73f6268 100644
--- a/src/atom/mod.rs
+++ b/src/atom/mod.rs
@@ -10,7 +10,7 @@ use get::Get;
 
 use itertools::Itertools;
 
-pub mod parsers;
+mod parsers;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Blocker {
diff --git a/src/lib.rs b/src/lib.rs
index f41a1a8..beeae1e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,5 +16,5 @@ pub trait Parseable<'a, I: Input + 'a> {
 }
 
 pub mod atom;
-pub mod ebuild;
+pub mod repo;
 pub mod useflag;
diff --git a/src/ebuild/mod.rs b/src/repo/ebuild/mod.rs
index 50d9f3f..3f52db9 100644
--- a/src/ebuild/mod.rs
+++ b/src/repo/ebuild/mod.rs
@@ -6,8 +6,7 @@ use crate::{
     useflag::{IUseFlag, UseFlag},
 };
 
-pub mod parsers;
-pub mod repo;
+mod parsers;
 
 #[derive(Clone, Debug)]
 pub enum Conditional {
@@ -59,26 +58,26 @@ pub struct Eclass(#[get(method = "get", kind = "deref")] String);
 
 #[derive(Debug, Clone, Get)]
 pub struct Ebuild {
-    name: Name,
-    version: Version,
-    slot: Option<Slot>,
-    homepage: Option<String>,
+    pub(super) name: Name,
+    pub(super) version: Version,
+    pub(super) slot: Option<Slot>,
+    pub(super) homepage: Option<String>,
     #[get(kind = "deref")]
-    src_uri: Vec<Depend<SrcUri>>,
-    eapi: Option<Eapi>,
+    pub(super) src_uri: Vec<Depend<SrcUri>>,
+    pub(super) eapi: Option<Eapi>,
     #[get(kind = "deref")]
-    inherit: Vec<Eclass>,
+    pub(super) inherit: Vec<Eclass>,
     #[get(kind = "deref")]
-    iuse: Vec<IUseFlag>,
+    pub(super) iuse: Vec<IUseFlag>,
     #[get(kind = "deref")]
-    license: Vec<Depend<License>>,
-    description: Option<String>,
+    pub(super) license: Vec<Depend<License>>,
+    pub(super) description: Option<String>,
     #[get(kind = "deref")]
-    depend: Vec<Depend<Atom>>,
+    pub(super) depend: Vec<Depend<Atom>>,
     #[get(kind = "deref")]
-    bdepend: Vec<Depend<Atom>>,
+    pub(super) bdepend: Vec<Depend<Atom>>,
     #[get(kind = "deref")]
-    rdepend: Vec<Depend<Atom>>,
+    pub(super) rdepend: Vec<Depend<Atom>>,
     #[get(kind = "deref")]
-    idepend: Vec<Depend<Atom>>,
+    pub(super) idepend: Vec<Depend<Atom>>,
 }
diff --git a/src/ebuild/parsers.rs b/src/repo/ebuild/parsers.rs
index aa801e8..c80cdf2 100644
--- a/src/ebuild/parsers.rs
+++ b/src/repo/ebuild/parsers.rs
@@ -6,7 +6,7 @@ use mon::{
 
 use crate::{
     Parseable,
-    ebuild::{Conditional, Depend, Eapi, Eclass, License, SrcUri, Uri, UriPrefix},
+    repo::ebuild::{Conditional, Depend, Eapi, Eclass, License, SrcUri, Uri, UriPrefix},
     useflag::UseFlag,
 };
 
@@ -174,7 +174,7 @@ mod test {
 
     use mon::{ParserIter, input::InputIter};
 
-    use crate::{atom::Atom, ebuild::Depend};
+    use crate::{atom::Atom, repo::ebuild::Depend};
 
     use super::*;
 
diff --git a/src/ebuild/repo/mod.rs b/src/repo/mod.rs
index ae2113c..46dd895 100644
--- a/src/ebuild/repo/mod.rs
+++ b/src/repo/mod.rs
@@ -10,10 +10,12 @@ use mon::{Parser, ParserIter, ascii_whitespace1, input::InputIter, tag};
 use crate::{
     Parseable,
     atom::{self, Atom},
-    ebuild::{Depend, Eapi, Ebuild, Eclass, License, SrcUri},
+    repo::ebuild::{Depend, Eapi, Ebuild, Eclass, License, SrcUri},
     useflag::IUseFlag,
 };
 
+pub mod ebuild;
+
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("io error: {0}")]
diff --git a/src/useflag/mod.rs b/src/useflag/mod.rs
index 1f814eb..c5a6424 100644
--- a/src/useflag/mod.rs
+++ b/src/useflag/mod.rs
@@ -2,7 +2,7 @@ use core::fmt;
 
 use get::Get;
 
-pub mod parsers;
+mod parsers;
 
 #[derive(Clone, Debug, PartialEq, Eq, Get)]
 pub struct UseFlag(#[get(method = "name", kind = "deref")] String);