diff options
Diffstat (limited to 'crates/shirabe/src/autoload')
| -rw-r--r-- | crates/shirabe/src/autoload/autoload_generator.rs | 8 | ||||
| -rw-r--r-- | crates/shirabe/src/autoload/class_map_generator.rs | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs index 3786011..59cf6ae 100644 --- a/crates/shirabe/src/autoload/autoload_generator.rs +++ b/crates/shirabe/src/autoload/autoload_generator.rs @@ -25,6 +25,7 @@ use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; use crate::installer::InstallationManager; use crate::io::IOInterface; +use crate::io::IOInterfaceImmutable; use crate::io::NullIO; use crate::json::JsonFile; use crate::package::Locker; @@ -40,7 +41,7 @@ use crate::util::Platform; #[derive(Debug)] pub struct AutoloadGenerator { event_dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, - io: Box<dyn IOInterface>, + io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, dev_mode: Option<bool>, class_map_authoritative: bool, apcu: bool, @@ -53,9 +54,10 @@ pub struct AutoloadGenerator { impl AutoloadGenerator { pub fn new( event_dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, - io: Option<Box<dyn IOInterface>>, + io: Option<std::rc::Rc<std::cell::RefCell<dyn IOInterface>>>, ) -> Self { - let io: Box<dyn IOInterface> = io.unwrap_or_else(|| Box::new(NullIO::new())); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + io.unwrap_or_else(|| std::rc::Rc::new(std::cell::RefCell::new(NullIO::new()))); Self { event_dispatcher, diff --git a/crates/shirabe/src/autoload/class_map_generator.rs b/crates/shirabe/src/autoload/class_map_generator.rs index da086ad..6aa6492 100644 --- a/crates/shirabe/src/autoload/class_map_generator.rs +++ b/crates/shirabe/src/autoload/class_map_generator.rs @@ -6,6 +6,7 @@ use shirabe_class_map_generator::class_map_generator::ClassMapGenerator as Exter use shirabe_php_shim::PhpMixed; use crate::io::IOInterface; +use crate::io::IOInterfaceImmutable; #[derive(Debug)] pub struct ClassMapGenerator; @@ -41,7 +42,7 @@ impl ClassMapGenerator { pub fn create_map( path: PhpMixed, excluded: Option<String>, - mut io: Option<Box<dyn IOInterface>>, + mut io: Option<std::rc::Rc<std::cell::RefCell<dyn IOInterface>>>, namespace: Option<String>, autoload_type: Option<String>, scanned_files: &mut IndexMap<String, bool>, |
