From 5b0c6a52022e67a2d9cee251b3d08b9cb2b5f6cb Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Sun, 9 Oct 2022 12:05:24 +0200
Subject: refactor!: reorganize DI containers

BREAKING CHANGE: DIContainer, AsyncDIContainer & the binding structs have been relocated
---
 macros/src/factory/build_declare_interfaces.rs | 12 ++++++------
 macros/src/injectable/implementation.rs        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'macros/src')

diff --git a/macros/src/factory/build_declare_interfaces.rs b/macros/src/factory/build_declare_interfaces.rs
index 61e162f..6ab135e 100644
--- a/macros/src/factory/build_declare_interfaces.rs
+++ b/macros/src/factory/build_declare_interfaces.rs
@@ -12,10 +12,10 @@ pub fn build_declare_factory_interfaces(
         quote! {
             syrette::declare_interface!(
                 syrette::castable_factory::threadsafe::ThreadsafeCastableFactory<
-                    (std::sync::Arc<syrette::async_di_container::AsyncDIContainer>,),
+                    (std::sync::Arc<syrette::AsyncDIContainer>,),
                     #factory_interface
                 > -> syrette::interfaces::factory::IThreadsafeFactory<
-                    (std::sync::Arc<syrette::async_di_container::AsyncDIContainer>,),
+                    (std::sync::Arc<syrette::AsyncDIContainer>,),
                     #factory_interface
                 >,
                 async = true
@@ -23,7 +23,7 @@ pub fn build_declare_factory_interfaces(
 
             syrette::declare_interface!(
                 syrette::castable_factory::threadsafe::ThreadsafeCastableFactory<
-                    (std::sync::Arc<syrette::async_di_container::AsyncDIContainer>,),
+                    (std::sync::Arc<syrette::AsyncDIContainer>,),
                     #factory_interface
                 > -> syrette::interfaces::any_factory::AnyThreadsafeFactory,
                 async = true
@@ -33,17 +33,17 @@ pub fn build_declare_factory_interfaces(
         quote! {
             syrette::declare_interface!(
                 syrette::castable_factory::blocking::CastableFactory<
-                    (std::rc::Rc<syrette::di_container::DIContainer>,),
+                    (std::rc::Rc<syrette::DIContainer>,),
                     #factory_interface
                 > -> syrette::interfaces::factory::IFactory<
-                    (std::rc::Rc<syrette::di_container::DIContainer>,),
+                    (std::rc::Rc<syrette::DIContainer>,),
                     #factory_interface
                 >
             );
 
             syrette::declare_interface!(
                 syrette::castable_factory::blocking::CastableFactory<
-                    (std::rc::Rc<syrette::di_container::DIContainer>,),
+                    (std::rc::Rc<syrette::DIContainer>,),
                     #factory_interface
                 > -> syrette::interfaces::any_factory::AnyFactory
             );
diff --git a/macros/src/injectable/implementation.rs b/macros/src/injectable/implementation.rs
index 82cbe16..c907f32 100644
--- a/macros/src/injectable/implementation.rs
+++ b/macros/src/injectable/implementation.rs
@@ -91,7 +91,7 @@ impl InjectableImpl
                 {
                     fn resolve<'di_container, 'fut>(
                         #di_container_var: &'di_container std::sync::Arc<
-                            syrette::async_di_container::AsyncDIContainer
+                            syrette::AsyncDIContainer
                         >,
                         mut #dependency_history_var: Vec<&'static str>,
                     ) -> syrette::future::BoxFuture<
-- 
cgit v1.2.3-18-g5258