From 3124741efe2f302042b06d8408ad541579db3978 Mon Sep 17 00:00:00 2001
From: steven-omaha <35634100+steven-omaha@users.noreply.github.com>
Date: Fri, 13 Jan 2023 14:18:18 +0100
Subject: [PATCH] clean up backend

---
 pacdef_macro/src/lib.rs            | 3 +--
 src/backend/actual/mod.rs          | 2 ++
 src/backend/{ => actual}/pacman.rs | 2 +-
 src/backend/{ => actual}/rust.rs   | 2 +-
 src/backend/mod.rs                 | 3 +--
 5 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 src/backend/actual/mod.rs
 rename src/backend/{ => actual}/pacman.rs (98%)
 rename src/backend/{ => actual}/rust.rs (98%)

diff --git a/pacdef_macro/src/lib.rs b/pacdef_macro/src/lib.rs
index 698cdea..c9687ca 100644
--- a/pacdef_macro/src/lib.rs
+++ b/pacdef_macro/src/lib.rs
@@ -71,7 +71,6 @@ where
 fn generate_variant_imports(enum_data: &syn::DataEnum) -> impl Iterator<Item = TokenStream2> + '_ {
     let variant_imports = enum_data.variants.iter().map(|variant| {
         let variant_name = &variant.ident;
-        // let variant_module = variant_name.clone();
 
         let variant_module = proc_macro2::Ident::new(
             &variant_name.to_string().to_lowercase(),
@@ -79,7 +78,7 @@ fn generate_variant_imports(enum_data: &syn::DataEnum) -> impl Iterator<Item = T
         );
 
         quote! {
-            pub(crate) use #variant_module::#variant_name;
+            pub(crate) use actual::#variant_module::#variant_name;
 
         }
     });
diff --git a/src/backend/actual/mod.rs b/src/backend/actual/mod.rs
new file mode 100644
index 0000000..fea2d97
--- /dev/null
+++ b/src/backend/actual/mod.rs
@@ -0,0 +1,2 @@
+pub mod pacman;
+pub mod rust;
diff --git a/src/backend/pacman.rs b/src/backend/actual/pacman.rs
similarity index 98%
rename from src/backend/pacman.rs
rename to src/backend/actual/pacman.rs
index 96beeed..fcffa77 100644
--- a/src/backend/pacman.rs
+++ b/src/backend/actual/pacman.rs
@@ -4,7 +4,7 @@ use alpm::Alpm;
 use alpm::PackageReason::Explicit;
 use anyhow::{Context, Result};
 
-use super::backend_trait::*;
+use crate::backend::backend_trait::*;
 use crate::{impl_backend_constants, Group, Package};
 
 pub(crate) struct Pacman {
diff --git a/src/backend/rust.rs b/src/backend/actual/rust.rs
similarity index 98%
rename from src/backend/rust.rs
rename to src/backend/actual/rust.rs
index e3c7334..b4317c5 100644
--- a/src/backend/rust.rs
+++ b/src/backend/actual/rust.rs
@@ -5,7 +5,7 @@ use std::path::PathBuf;
 use anyhow::{Context, Result};
 use serde_json::Value;
 
-use super::backend_trait::*;
+use crate::backend::backend_trait::*;
 use crate::{impl_backend_constants, Group, Package};
 
 pub(crate) struct Rust {
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index e7b3b72..b04b50a 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -1,8 +1,7 @@
+mod actual;
 mod backend_trait;
 mod iter;
 mod macros;
-mod pacman;
-mod rust;
 mod todo_per_backend;
 
 pub(crate) use backend_trait::Backend;