aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/loader
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/package/loader')
-rw-r--r--crates/shirabe/src/package/loader/array_loader.rs8
-rw-r--r--crates/shirabe/src/package/loader/json_loader.rs2
-rw-r--r--crates/shirabe/src/package/loader/loader_interface.rs2
-rw-r--r--crates/shirabe/src/package/loader/validating_array_loader.rs2
4 files changed, 7 insertions, 7 deletions
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs
index 72d9754..28e13af 100644
--- a/crates/shirabe/src/package/loader/array_loader.rs
+++ b/crates/shirabe/src/package/loader/array_loader.rs
@@ -51,7 +51,7 @@ impl LoaderInterface for ArrayLoader {
&self,
mut config: IndexMap<String, PhpMixed>,
class: Option<String>,
- ) -> Result<Box<BasePackage>> {
+ ) -> Result<Box<dyn BasePackage>> {
let class = class.unwrap_or_else(|| "Composer\\Package\\CompletePackage".to_string());
if class != "Composer\\Package\\CompletePackage"
@@ -104,8 +104,8 @@ impl ArrayLoader {
pub fn load_packages(
&self,
versions: Vec<IndexMap<String, PhpMixed>>,
- ) -> Result<Vec<Box<BasePackage>>> {
- let mut packages: Vec<Box<BasePackage>> = vec![];
+ ) -> Result<Vec<Box<dyn BasePackage>>> {
+ let mut packages: Vec<Box<dyn BasePackage>> = vec![];
let mut link_cache: IndexMap<
String,
IndexMap<String, IndexMap<String, IndexMap<String, (String, Link)>>>,
@@ -226,7 +226,7 @@ impl ArrayLoader {
&self,
mut package: Box<CompletePackage>,
config: &mut IndexMap<String, PhpMixed>,
- ) -> Result<Box<BasePackage>> {
+ ) -> Result<Box<dyn BasePackage>> {
// PHP: if (!$package instanceof CompletePackage) — true by construction in Rust
// (create_object always returns Box<CompletePackage>); kept as a no-op for parity.
let _ = LogicException {
diff --git a/crates/shirabe/src/package/loader/json_loader.rs b/crates/shirabe/src/package/loader/json_loader.rs
index 8f10995..978bc28 100644
--- a/crates/shirabe/src/package/loader/json_loader.rs
+++ b/crates/shirabe/src/package/loader/json_loader.rs
@@ -20,7 +20,7 @@ impl JsonLoader {
Self { loader }
}
- pub fn load(&self, json: JsonLoaderInput) -> Result<Box<BasePackage>> {
+ pub fn load(&self, json: JsonLoaderInput) -> Result<Box<dyn BasePackage>> {
let config = match json {
JsonLoaderInput::File(json_file) => json_file.read()?,
JsonLoaderInput::String(ref s) if Path::new(s).exists() => {
diff --git a/crates/shirabe/src/package/loader/loader_interface.rs b/crates/shirabe/src/package/loader/loader_interface.rs
index 530f1eb..f941f9a 100644
--- a/crates/shirabe/src/package/loader/loader_interface.rs
+++ b/crates/shirabe/src/package/loader/loader_interface.rs
@@ -9,5 +9,5 @@ pub trait LoaderInterface {
&self,
config: IndexMap<String, PhpMixed>,
class: Option<String>,
- ) -> anyhow::Result<Box<BasePackage>>;
+ ) -> anyhow::Result<Box<dyn BasePackage>>;
}
diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index c1be9f2..3ba9212 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -65,7 +65,7 @@ impl ValidatingArrayLoader {
&mut self,
config: IndexMap<String, Box<PhpMixed>>,
class: &str,
- ) -> anyhow::Result<Box<BasePackage>> {
+ ) -> anyhow::Result<Box<dyn BasePackage>> {
self.errors = Vec::new();
self.warnings = Vec::new();
self.config = config.clone();