From af8172690a0d06f395603128173da280c7c4d67c Mon Sep 17 00:00:00 2001
From: steven-omaha <35634100+steven-omaha@users.noreply.github.com>
Date: Wed, 11 Jan 2023 13:22:27 +0100
Subject: [PATCH] extract group, section, package to grouping module

---
 src/{ => grouping}/group.rs   | 2 +-
 src/grouping/mod.rs           | 7 +++++++
 src/{ => grouping}/package.rs | 0
 src/{ => grouping}/section.rs | 2 +-
 src/lib.rs                    | 8 +++-----
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename src/{ => grouping}/group.rs (98%)
 create mode 100644 src/grouping/mod.rs
 rename src/{ => grouping}/package.rs (100%)
 rename src/{ => grouping}/section.rs (99%)

diff --git a/src/group.rs b/src/grouping/group.rs
similarity index 98%
rename from src/group.rs
rename to src/grouping/group.rs
index d203029..aa323ca 100644
--- a/src/group.rs
+++ b/src/grouping/group.rs
@@ -5,7 +5,7 @@ use std::{collections::HashSet, fmt::Display};
 
 use anyhow::{Context, Result};
 
-use crate::section::Section;
+use super::Section;
 
 #[derive(Debug)]
 pub struct Group {
diff --git a/src/grouping/mod.rs b/src/grouping/mod.rs
new file mode 100644
index 0000000..1429384
--- /dev/null
+++ b/src/grouping/mod.rs
@@ -0,0 +1,7 @@
+mod group;
+mod package;
+mod section;
+
+pub use group::Group;
+pub(super) use package::Package;
+pub(super) use section::Section;
diff --git a/src/package.rs b/src/grouping/package.rs
similarity index 100%
rename from src/package.rs
rename to src/grouping/package.rs
diff --git a/src/section.rs b/src/grouping/section.rs
similarity index 99%
rename from src/section.rs
rename to src/grouping/section.rs
index 96df643..130e037 100644
--- a/src/section.rs
+++ b/src/grouping/section.rs
@@ -7,7 +7,7 @@ use std::{
 
 use anyhow::{ensure, Context, Result};
 
-use crate::Package;
+use super::Package;
 
 #[derive(Debug, Eq)]
 pub struct Section {
diff --git a/src/lib.rs b/src/lib.rs
index a527e06..8de3747 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,12 +4,10 @@ mod backend;
 mod cmd;
 mod core;
 mod env;
-mod group;
-mod package;
+mod grouping;
 mod path;
-mod section;
 mod ui;
 
 pub use crate::core::Pacdef;
-pub use group::Group;
-pub use package::Package;
+pub use crate::grouping::Group;
+pub(crate) use crate::grouping::Package;