diff options
Diffstat (limited to 'crates/shirabe/src/autoload')
| -rw-r--r-- | crates/shirabe/src/autoload/autoload_generator.rs | 18 | ||||
| -rw-r--r-- | crates/shirabe/src/autoload/class_loader.rs | 10 |
2 files changed, 10 insertions, 18 deletions
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs index 49eade41..bb8fcd0b 100644 --- a/crates/shirabe/src/autoload/autoload_generator.rs +++ b/crates/shirabe/src/autoload/autoload_generator.rs @@ -607,7 +607,7 @@ impl AutoloadGenerator { if check_platform { platform_check_content = self.get_platform_check( &package_map, - config.get("platform-check").clone(), + config.get("platform-check"), dev_package_names, ); if platform_check_content.is_none() { @@ -631,7 +631,7 @@ impl AutoloadGenerator { &self.get_autoload_real_file( true, include_path_file_contents.is_some(), - target_dir_loader.clone(), + target_dir_loader, include_files_file_contents.is_some(), &vendor_path_code, &app_base_dir_code, @@ -828,11 +828,8 @@ impl AutoloadGenerator { // sorted (i.e. dependents first) for files to ensure that dependencies are loaded/available once a file is included let files = self.parse_autoloads_type(&sorted_package_map, "files", root_package.clone()); // using sorted here but it does not really matter as all are excluded equally - let exclude = self.parse_autoloads_type( - &sorted_package_map, - "exclude-from-classmap", - root_package.clone(), - ); + let exclude = + self.parse_autoloads_type(&sorted_package_map, "exclude-from-classmap", root_package); psr0.sort_by(|k1, _, k2, _| k2.cmp(k1)); psr4.sort_by(|k1, _, k2, _| k2.cmp(k1)); @@ -1961,12 +1958,7 @@ class ComposerStaticInit{} } } } - add( - root_package.clone().into(), - &packages, - &mut include, - &replaced_by, - ); + add(root_package.into(), &packages, &mut include, &replaced_by); package_map .into_iter() diff --git a/crates/shirabe/src/autoload/class_loader.rs b/crates/shirabe/src/autoload/class_loader.rs index 3ebb7a7d..3bcc6f81 100644 --- a/crates/shirabe/src/autoload/class_loader.rs +++ b/crates/shirabe/src/autoload/class_loader.rs @@ -131,7 +131,7 @@ impl ClassLoader { pub fn add(&mut self, prefix: &str, paths: Vec<String>, prepend: bool) { if prefix.is_empty() { if prepend { - let mut new_dirs = paths.clone(); + let mut new_dirs = paths; new_dirs.append(&mut self.fallback_dirs_psr0); self.fallback_dirs_psr0 = new_dirs; } else { @@ -142,14 +142,14 @@ impl ClassLoader { } let first = prefix.chars().next().unwrap_or('\0').to_string(); - let entry = self.prefixes_psr0.entry(first.clone()).or_default(); + let entry = self.prefixes_psr0.entry(first).or_default(); if !entry.contains_key(prefix) { entry.insert(prefix.to_string(), paths); return; } let existing = entry.get_mut(prefix).unwrap(); if prepend { - let mut new_dirs = paths.clone(); + let mut new_dirs = paths; new_dirs.append(existing); *existing = new_dirs; } else { @@ -170,7 +170,7 @@ impl ClassLoader { if prefix.is_empty() { // Register directories for the root namespace. if prepend { - let mut new_dirs = paths.clone(); + let mut new_dirs = paths; new_dirs.append(&mut self.fallback_dirs_psr4); self.fallback_dirs_psr4 = new_dirs; } else { @@ -196,7 +196,7 @@ impl ClassLoader { } else if prepend { // Prepend directories for an already registered namespace. let existing = self.prefix_dirs_psr4.get_mut(prefix).unwrap(); - let mut new_dirs = paths.clone(); + let mut new_dirs = paths; new_dirs.append(existing); *existing = new_dirs; } else { |