From 432472808051cb4f1bb9517b858dbc810aaa5a63 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 25 Jul 2026 16:16:33 +0900 Subject: refactor: replace redundant clones with moves Co-Authored-By: Claude Opus 5 --- .../tests/package/archiver/archive_manager_test.rs | 6 +++--- .../package/loader/root_package_loader_test.rs | 21 ++++++-------------- .../tests/package/version/version_selector_test.rs | 23 +++++++++------------- 3 files changed, 18 insertions(+), 32 deletions(-) (limited to 'crates/shirabe/tests/package') diff --git a/crates/shirabe/tests/package/archiver/archive_manager_test.rs b/crates/shirabe/tests/package/archiver/archive_manager_test.rs index 4f28b468..d85fac10 100644 --- a/crates/shirabe/tests/package/archiver/archive_manager_test.rs +++ b/crates/shirabe/tests/package/archiver/archive_manager_test.rs @@ -55,9 +55,9 @@ impl TestCase { "git", std::rc::Rc::new(std::cell::RefCell::new(GitDownloader::new( io.clone(), - config.clone(), - Some(process.clone()), - Some(fs.clone()), + config, + Some(process), + Some(fs), ))), ); let dm = std::rc::Rc::new(std::cell::RefCell::new(dm)); diff --git a/crates/shirabe/tests/package/loader/root_package_loader_test.rs b/crates/shirabe/tests/package/loader/root_package_loader_test.rs index 248c4e6a..51ca415f 100644 --- a/crates/shirabe/tests/package/loader/root_package_loader_test.rs +++ b/crates/shirabe/tests/package/loader/root_package_loader_test.rs @@ -123,8 +123,7 @@ fn test_stability_flags_parsing() { Some(io.clone()), ); - let mut loader = - RootPackageLoader::new(manager, config.clone(), None, Some(Box::new(guesser)), None); + let mut loader = RootPackageLoader::new(manager, config, None, Some(Box::new(guesser)), None); let mut data = IndexMap::new(); data.insert( @@ -209,8 +208,7 @@ fn test_no_version_is_visible_in_pretty_version() { ); let guesser = VersionGuesser::new(config.clone(), process, VersionParser::new(), None); - let mut loader = - RootPackageLoader::new(manager, config.clone(), None, Some(Box::new(guesser)), None); + let mut loader = RootPackageLoader::new(manager, config, None, Some(Box::new(guesser)), None); let package = loader .load(IndexMap::new(), "Composer\\Package\\RootPackage", None) @@ -246,13 +244,8 @@ fn test_pretty_version_for_root_package_in_version_branch() { })) }); - let mut loader = RootPackageLoader::new( - manager, - config.clone(), - None, - Some(Box::new(version_guesser)), - None, - ); + let mut loader = + RootPackageLoader::new(manager, config, None, Some(Box::new(version_guesser)), None); let package = loader .load(IndexMap::new(), "Composer\\Package\\RootPackage", None) @@ -284,8 +277,7 @@ fn test_feature_branch_pretty_version() { let (process, _guard) = get_process_executor_mock(expectations, true, MockHandler::default()); let guesser = VersionGuesser::new(config.clone(), process, VersionParser::new(), None); - let mut loader = - RootPackageLoader::new(manager, config.clone(), None, Some(Box::new(guesser)), None); + let mut loader = RootPackageLoader::new(manager, config, None, Some(Box::new(guesser)), None); let mut data = IndexMap::new(); data.insert( @@ -323,8 +315,7 @@ fn test_non_feature_branch_pretty_version() { let (process, _guard) = get_process_executor_mock(expectations, true, MockHandler::default()); let guesser = VersionGuesser::new(config.clone(), process, VersionParser::new(), None); - let mut loader = - RootPackageLoader::new(manager, config.clone(), None, Some(Box::new(guesser)), None); + let mut loader = RootPackageLoader::new(manager, config, None, Some(Box::new(guesser)), None); let mut data = IndexMap::new(); data.insert( diff --git a/crates/shirabe/tests/package/version/version_selector_test.rs b/crates/shirabe/tests/package/version/version_selector_test.rs index 7c6eca78..b194eb5f 100644 --- a/crates/shirabe/tests/package/version/version_selector_test.rs +++ b/crates/shirabe/tests/package/version/version_selector_test.rs @@ -99,7 +99,7 @@ fn test_latest_version_is_returned() { let package1 = get_package("foo/bar", "1.2.1"); let package2 = get_package("foo/bar", "1.2.2"); let package3 = get_package("foo/bar", "1.2.0"); - let packages = vec![package1.clone(), package2.clone(), package3.clone()]; + let packages = vec![package1, package2.clone(), package3]; let mut repository_set = MockRepositorySet::new(); repository_set @@ -143,12 +143,7 @@ fn test_latest_version_is_returned_that_matches_php_requirements() { "php".to_string(), require_link(package_name, "php", ">=5.6"), )])); - let packages = vec![ - package0.clone(), - package1.clone(), - package2.clone(), - package3.clone(), - ]; + let packages = vec![package0, package1.clone(), package2, package3.clone()]; let mut repository_set = MockRepositorySet::new(); repository_set @@ -369,7 +364,7 @@ fn test_most_stable_version_is_returned() { let package1 = get_package("foo/bar", "1.0.0"); let package2 = get_package("foo/bar", "1.1.0-beta"); - let packages = vec![package1.clone(), package2.clone()]; + let packages = vec![package1.clone(), package2]; let mut repository_set = MockRepositorySet::new(); repository_set @@ -393,7 +388,7 @@ fn test_most_stable_version_is_returned_regardless_of_order() { let package1 = get_package("foo/bar", "2.x-dev"); let package2 = get_package("foo/bar", "2.0.0-beta3"); - let packages = vec![package1.clone(), package2.clone()]; + let packages = vec![package1, package2.clone()]; let reversed: Vec = packages.iter().rev().cloned().collect(); let mut repository_set = MockRepositorySet::new(); @@ -431,7 +426,7 @@ fn test_highest_version_is_returned() { let package1 = get_package("foo/bar", "1.0.0"); let package2 = get_package("foo/bar", "1.1.0-beta"); - let packages = vec![package1.clone(), package2.clone()]; + let packages = vec![package1, package2.clone()]; let mut repository_set = MockRepositorySet::new(); repository_set @@ -456,7 +451,7 @@ fn test_highest_version_matching_stability_is_returned() { let package1 = get_package("foo/bar", "1.0.0"); let package2 = get_package("foo/bar", "1.1.0-beta"); let package3 = get_package("foo/bar", "1.2.0-alpha"); - let packages = vec![package1.clone(), package2.clone(), package3.clone()]; + let packages = vec![package1, package2.clone(), package3]; let mut repository_set = MockRepositorySet::new(); repository_set @@ -480,7 +475,7 @@ fn test_most_stable_unstable_version_is_returned() { let package2 = get_package("foo/bar", "1.1.0-beta"); let package3 = get_package("foo/bar", "1.2.0-alpha"); - let packages = vec![package2.clone(), package3.clone()]; + let packages = vec![package2.clone(), package3]; let mut repository_set = MockRepositorySet::new(); repository_set @@ -511,7 +506,7 @@ fn test_default_branch_alias_is_never_returned() { VersionParser::DEFAULT_BRANCH_ALIAS.to_string(), ) .into(); - let packages = vec![package.clone(), package2_alias.clone()]; + let packages = vec![package, package2_alias]; let mut repository_set = MockRepositorySet::new(); repository_set @@ -628,7 +623,7 @@ fn test_find_recommended_require_version() { "foo/bar", ), // ext in sync with php - (php_version.clone(), "*", None, "ext-filter"), + (php_version, "*", None, "ext-filter"), // ext versioned individually ("3.0.5".to_string(), "^3.0", None, "ext-xdebug"), ]; -- cgit v1.3.1