diff options
Diffstat (limited to 'crates/shirabe/tests')
26 files changed, 115 insertions, 145 deletions
diff --git a/crates/shirabe/tests/advisory/auditor_test.rs b/crates/shirabe/tests/advisory/auditor_test.rs index 2b86718b..5e6a3ba8 100644 --- a/crates/shirabe/tests/advisory/auditor_test.rs +++ b/crates/shirabe/tests/advisory/auditor_test.rs @@ -988,7 +988,7 @@ fn test_audit_with_ignore_unreachable() { .audit( &io, &repo_set, - packages.clone(), + packages, Auditor::FORMAT_JSON, false, IndexMap::new(), diff --git a/crates/shirabe/tests/command/remove_command_test.rs b/crates/shirabe/tests/command/remove_command_test.rs index 252496ea..52e27829 100644 --- a/crates/shirabe/tests/command/remove_command_test.rs +++ b/crates/shirabe/tests/command/remove_command_test.rs @@ -230,8 +230,7 @@ fn test_message_output_when_no_unused_packages_to_remove() { required_package.__set_requires(requires); let nested_package = get_package("nested/req", "1.1.0"); - let packages: Vec<PackageInterfaceHandle> = - vec![required_package.clone(), nested_package.clone()]; + let packages: Vec<PackageInterfaceHandle> = vec![required_package, nested_package]; create_installed_json(&packages, &[], true); create_composer_lock(&packages, &[]); @@ -281,7 +280,7 @@ fn test_remove_unused_package() { let extraneous_package = get_package("not/req", "1.0.0"); create_installed_json(std::slice::from_ref(&required_package), &[], true); - create_composer_lock(&[required_package.clone(), extraneous_package.clone()], &[]); + create_composer_lock(&[required_package, extraneous_package], &[]); let mut app_tester = get_application_tester(); let status_code = app_tester @@ -348,8 +347,7 @@ fn test_remove_package_by_name() { root_req_package.__set_type("metapackage".to_string()); root_another_package.__set_type("metapackage".to_string()); - let packages: Vec<PackageInterfaceHandle> = - vec![root_req_package.clone(), root_another_package.clone()]; + let packages: Vec<PackageInterfaceHandle> = vec![root_req_package, root_another_package]; create_installed_json(&packages, &[], true); create_composer_lock(&packages, &[]); @@ -430,8 +428,7 @@ fn test_remove_package_by_name_with_dry_run() { root_req_package.__set_type("metapackage".to_string()); root_another_package.__set_type("metapackage".to_string()); - let packages: Vec<PackageInterfaceHandle> = - vec![root_req_package.clone(), root_another_package.clone()]; + let packages: Vec<PackageInterfaceHandle> = vec![root_req_package, root_another_package]; create_installed_json(&packages, &[], true); create_composer_lock(&packages, &[]); @@ -517,8 +514,7 @@ fn test_remove_allowed_plugin_package_with_no_other_allowed_plugins() { root_req_package.__set_type("metapackage".to_string()); root_another_package.__set_type("metapackage".to_string()); - let packages: Vec<PackageInterfaceHandle> = - vec![root_req_package.clone(), root_another_package.clone()]; + let packages: Vec<PackageInterfaceHandle> = vec![root_req_package, root_another_package]; create_installed_json(&packages, &[], true); create_composer_lock(&packages, &[]); @@ -624,11 +620,8 @@ fn test_remove_packages_by_vendor() { let root_another_package = get_package("root/another", "1.0.0"); let another_req_package = get_package("another/req", "1.0.0"); - let packages: Vec<PackageInterfaceHandle> = vec![ - root_req_package.clone(), - root_another_package.clone(), - another_req_package.clone(), - ]; + let packages: Vec<PackageInterfaceHandle> = + vec![root_req_package, root_another_package, another_req_package]; create_installed_json(&packages, &[], true); create_composer_lock(&packages, &[]); @@ -707,11 +700,8 @@ fn test_remove_packages_by_vendor_with_dry_run() { let root_another_package = get_package("root/another", "1.0.0"); let another_req_package = get_package("another/req", "1.0.0"); - let packages: Vec<PackageInterfaceHandle> = vec![ - root_req_package.clone(), - root_another_package.clone(), - another_req_package.clone(), - ]; + let packages: Vec<PackageInterfaceHandle> = + vec![root_req_package, root_another_package, another_req_package]; create_installed_json(&packages, &[], true); create_composer_lock(&packages, &[]); diff --git a/crates/shirabe/tests/command/suggests_command_test.rs b/crates/shirabe/tests/command/suggests_command_test.rs index e6732dc8..dd793c40 100644 --- a/crates/shirabe/tests/command/suggests_command_test.rs +++ b/crates/shirabe/tests/command/suggests_command_test.rs @@ -221,7 +221,7 @@ fn test_suggest() { let by_suggestion = ("--by-suggestion", t.clone()); let no_dev = ("--no-dev", t.clone()); let all = ("--all", t.clone()); - let list = ("--list", t.clone()); + let list = ("--list", t); // 'with lockfile, show suggested' / 'without lockfile, show suggested' let basic = "vendor1/package1 suggests: diff --git a/crates/shirabe/tests/config_test.rs b/crates/shirabe/tests/config_test.rs index 918da8c2..3831e283 100644 --- a/crates/shirabe/tests/config_test.rs +++ b/crates/shirabe/tests/config_test.rs @@ -506,7 +506,7 @@ fn test_prohibited_urls_warning_verify_peer() { .unwrap(); let mut config = Config::new(false, None); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; let mut repo_options: IndexMap<String, PhpMixed> = IndexMap::new(); repo_options.insert( "ssl".to_string(), diff --git a/crates/shirabe/tests/dependency_resolver/default_policy_test.rs b/crates/shirabe/tests/dependency_resolver/default_policy_test.rs index 2717954c..44724b33 100644 --- a/crates/shirabe/tests/dependency_resolver/default_policy_test.rs +++ b/crates/shirabe/tests/dependency_resolver/default_policy_test.rs @@ -505,10 +505,7 @@ fn test_select_local_repos_first() { package_a_alias_important.set_root_package_alias(true); fixtures.repo.add_package(package_a).unwrap(); - fixtures - .repo - .add_package(package_a_alias.clone().into()) - .unwrap(); + fixtures.repo.add_package(package_a_alias.into()).unwrap(); repo_important.add_package(package_a_important).unwrap(); repo_important .add_package(package_a_alias_important.clone().into()) diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs index 9b82908d..40ae115d 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs @@ -539,7 +539,7 @@ fn run_test_pool_builder( } } - let mut request = Request::new(Some(locked_repo.clone())); + let mut request = Request::new(Some(locked_repo)); for (package, constraint) in request_map["require"].as_array().unwrap() { request .require_name( diff --git a/crates/shirabe/tests/dependency_resolver/security_advisory_pool_filter_test.rs b/crates/shirabe/tests/dependency_resolver/security_advisory_pool_filter_test.rs index 15eace79..37403b19 100644 --- a/crates/shirabe/tests/dependency_resolver/security_advisory_pool_filter_test.rs +++ b/crates/shirabe/tests/dependency_resolver/security_advisory_pool_filter_test.rs @@ -75,7 +75,7 @@ fn test_filter_packages_by_advisories() { let pool = Pool::new( vec![ - package.clone(), + package, expected_package1.clone(), expected_package2.clone(), ], @@ -323,7 +323,7 @@ fn test_dont_filter_packages_with_abandoned_package() { let pool = Pool::new( vec![ expected_package.clone(), - abandoned_package.clone(), + abandoned_package, ignore_abandoned_package.clone(), ], vec![], diff --git a/crates/shirabe/tests/dependency_resolver/solver_test.rs b/crates/shirabe/tests/dependency_resolver/solver_test.rs index be8df4db..4a449c7f 100644 --- a/crates/shirabe/tests/dependency_resolver/solver_test.rs +++ b/crates/shirabe/tests/dependency_resolver/solver_test.rs @@ -329,7 +329,7 @@ fn test_solver_install_same_package_from_different_repositories() { let foo1 = get_package("foo", "1"); let foo2 = get_package("foo", "1"); repo1.add_package(foo1.clone()).unwrap(); - repo2.add_package(foo2.clone()).unwrap(); + repo2.add_package(foo2).unwrap(); repo_set .add_repository(RepositoryInterfaceHandle::new(repo1)) @@ -362,7 +362,7 @@ fn test_solver_install_with_deps() { let package_b = get_package("B", "1.0"); fixtures.repo.add_package(package_b.clone()).unwrap(); let new_package_b = get_package("B", "1.1"); - fixtures.repo.add_package(new_package_b.clone()).unwrap(); + fixtures.repo.add_package(new_package_b).unwrap(); package_a .as_complete_package() @@ -404,13 +404,13 @@ fn test_solver_install_honours_not_equal_operator() { let package_a = get_package("A", "1.0"); fixtures.repo.add_package(package_a.clone()).unwrap(); let package_b = get_package("B", "1.0"); - fixtures.repo.add_package(package_b.clone()).unwrap(); + fixtures.repo.add_package(package_b).unwrap(); let new_package_b11 = get_package("B", "1.1"); fixtures.repo.add_package(new_package_b11.clone()).unwrap(); let new_package_b12 = get_package("B", "1.2"); - fixtures.repo.add_package(new_package_b12.clone()).unwrap(); + fixtures.repo.add_package(new_package_b12).unwrap(); let new_package_b13 = get_package("B", "1.3"); - fixtures.repo.add_package(new_package_b13.clone()).unwrap(); + fixtures.repo.add_package(new_package_b13).unwrap(); package_a .as_complete_package() @@ -585,7 +585,7 @@ fn test_solver_multi_package_name_version_resolution_depends_on_require_order() vec![ ExpectedJob::Single { job: "install", - package: php80.clone(), + package: php80, }, ExpectedJob::Single { job: "install", @@ -595,7 +595,7 @@ fn test_solver_multi_package_name_version_resolution_depends_on_require_order() ); // now we flip the requirements around: we request "ext-foobar" before "php" - let mut request = Request::new(Some(fixtures.repo_locked.clone())); + let mut request = Request::new(Some(fixtures.repo_locked)); request.require_name("ourcustom/ext-foobar", None).unwrap(); request.require_name("ourcustom/PHP", None).unwrap(); @@ -620,7 +620,7 @@ fn test_solver_multi_package_name_version_resolution_is_independent_of_require_o { let fixtures = set_up(); let php74 = get_package("ourcustom/PHP", "7.4"); - fixtures.repo.add_package(php74.clone()).unwrap(); + fixtures.repo.add_package(php74).unwrap(); let php80 = get_package("ourcustom/PHP", "8.0"); fixtures.repo.add_package(php80.clone()).unwrap(); // note we are inserting this one into the repo first, unlike in the previous test @@ -689,7 +689,7 @@ fn test_solver_multi_package_name_version_resolution_is_independent_of_require_o ); // unlike in the previous test, the order of requirements no longer matters now - let mut request = Request::new(Some(fixtures.repo_locked.clone())); + let mut request = Request::new(Some(fixtures.repo_locked)); request.require_name("ourcustom/ext-foobar", None).unwrap(); request.require_name("ourcustom/PHP", None).unwrap(); @@ -716,7 +716,7 @@ fn test_solver_fix_locked() { fixtures.repo_locked.add_package(package_a.clone()).unwrap(); let mut request = fixtures.request; - request.fix_package(package_a.clone()); + request.fix_package(package_a); check_solver_result( fixtures.repo_set, @@ -735,7 +735,7 @@ fn test_solver_fix_locked_with_alternative() { fixtures.repo_locked.add_package(package_a.clone()).unwrap(); let mut request = fixtures.request; - request.fix_package(package_a.clone()); + request.fix_package(package_a); check_solver_result( fixtures.repo_set, @@ -770,7 +770,7 @@ fn test_solver_update_does_only_update() { )])); let mut request = fixtures.request; - request.fix_package(package_a.clone()); + request.fix_package(package_a); request .require_name("B", Some(get_version_constraint("=", "1.1.0.0"))) .unwrap(); @@ -899,11 +899,11 @@ fn test_solver_update_only_updates_selected_package() { let package_a_newer = get_package("A", "1.1"); fixtures.repo.add_package(package_a_newer.clone()).unwrap(); let package_b_newer = get_package("B", "1.1"); - fixtures.repo.add_package(package_b_newer.clone()).unwrap(); + fixtures.repo.add_package(package_b_newer).unwrap(); let mut request = fixtures.request; request.require_name("A", None).unwrap(); - request.fix_package(package_b.clone()); + request.fix_package(package_b); check_solver_result( fixtures.repo_set, @@ -1019,7 +1019,7 @@ fn test_solver_all_jobs() { let package_b = get_package("B", "1.0"); fixtures.repo.add_package(package_b.clone()).unwrap(); let new_package_b = get_package("B", "1.1"); - fixtures.repo.add_package(new_package_b.clone()).unwrap(); + fixtures.repo.add_package(new_package_b).unwrap(); let package_c = get_package("C", "1.1"); fixtures.repo.add_package(package_c.clone()).unwrap(); fixtures.repo.add_package(get_package("D", "1.0")).unwrap(); @@ -1074,9 +1074,9 @@ fn test_solver_three_alternative_require_and_conflict() { let middle_package_b = get_package("B", "1.0"); fixtures.repo.add_package(middle_package_b.clone()).unwrap(); let new_package_b = get_package("B", "1.1"); - fixtures.repo.add_package(new_package_b.clone()).unwrap(); + fixtures.repo.add_package(new_package_b).unwrap(); let old_package_b = get_package("B", "0.9"); - fixtures.repo.add_package(old_package_b.clone()).unwrap(); + fixtures.repo.add_package(old_package_b).unwrap(); package_a .as_complete_package() .unwrap() @@ -1170,7 +1170,7 @@ fn test_install_one_of_two_alternatives() { let package_a = get_package("A", "1.0"); fixtures.repo.add_package(package_a.clone()).unwrap(); let package_b = get_package("A", "1.0"); - fixtures.repo.add_package(package_b.clone()).unwrap(); + fixtures.repo.add_package(package_b).unwrap(); let mut request = fixtures.request; request.require_name("A", None).unwrap(); @@ -1337,7 +1337,7 @@ fn test_skip_replaced_package_if_replacer_is_selected() { let package_q = get_package("Q", "1.0"); fixtures.repo.add_package(package_q.clone()).unwrap(); let package_b = get_package("B", "1.0"); - fixtures.repo.add_package(package_b.clone()).unwrap(); + fixtures.repo.add_package(package_b).unwrap(); package_a .as_complete_package() .unwrap() @@ -1509,7 +1509,7 @@ fn test_install_circular_require() { let package_a = get_package("A", "1.0"); fixtures.repo.add_package(package_a.clone()).unwrap(); let package_b1 = get_package("B", "0.9"); - fixtures.repo.add_package(package_b1.clone()).unwrap(); + fixtures.repo.add_package(package_b1).unwrap(); let package_b2 = get_package("B", "1.1"); fixtures.repo.add_package(package_b2.clone()).unwrap(); package_a @@ -1675,7 +1675,7 @@ fn test_use_replacer_if_necessary() { let package_a = get_package("A", "1.0"); fixtures.repo.add_package(package_a.clone()).unwrap(); let package_b = get_package("B", "1.0"); - fixtures.repo.add_package(package_b.clone()).unwrap(); + fixtures.repo.add_package(package_b).unwrap(); let package_d = get_package("D", "1.0"); fixtures.repo.add_package(package_d.clone()).unwrap(); let package_d2 = get_package("D", "1.1"); @@ -1779,11 +1779,11 @@ fn test_use_replacer_if_necessary() { fn test_issue265() { let fixtures = set_up(); let package_a1 = get_package("A", "2.0.999999-dev"); - fixtures.repo.add_package(package_a1.clone()).unwrap(); + fixtures.repo.add_package(package_a1).unwrap(); let package_a2 = get_package("A", "2.1-dev"); - fixtures.repo.add_package(package_a2.clone()).unwrap(); + fixtures.repo.add_package(package_a2).unwrap(); let package_a3 = get_package("A", "2.2-dev"); - fixtures.repo.add_package(package_a3.clone()).unwrap(); + fixtures.repo.add_package(package_a3).unwrap(); let package_b1 = get_package("B", "2.0.10"); fixtures.repo.add_package(package_b1.clone()).unwrap(); let package_b2 = get_package("B", "2.0.9"); @@ -1898,7 +1898,7 @@ fn test_conflict_result_empty() { let package_a = get_package("A", "1.0"); fixtures.repo.add_package(package_a.clone()).unwrap(); let package_b = get_package("B", "1.0"); - fixtures.repo.add_package(package_b.clone()).unwrap(); + fixtures.repo.add_package(package_b).unwrap(); package_a .as_complete_package() .unwrap() @@ -1955,7 +1955,7 @@ fn test_unsatisfiable_requires() { let package_a = get_package("A", "1.0"); fixtures.repo.add_package(package_a.clone()).unwrap(); let package_b = get_package("B", "1.0"); - fixtures.repo.add_package(package_b.clone()).unwrap(); + fixtures.repo.add_package(package_b).unwrap(); package_a .as_complete_package() @@ -2093,11 +2093,11 @@ fn test_require_mismatch_exception() { fn test_learn_literals_with_sorted_rule_literals() { let fixtures = set_up(); let package_twig2 = get_package("twig/twig", "2.0"); - fixtures.repo.add_package(package_twig2.clone()).unwrap(); + fixtures.repo.add_package(package_twig2).unwrap(); let package_twig16 = get_package("twig/twig", "1.6"); fixtures.repo.add_package(package_twig16.clone()).unwrap(); let package_twig15 = get_package("twig/twig", "1.5"); - fixtures.repo.add_package(package_twig15.clone()).unwrap(); + fixtures.repo.add_package(package_twig15).unwrap(); let package_symfony = get_package("symfony/symfony", "2.0"); fixtures.repo.add_package(package_symfony.clone()).unwrap(); let package_twig_bridge = get_package("symfony/twig-bridge", "2.0"); @@ -2158,7 +2158,7 @@ fn test_learn_literals_with_sorted_rule_literals() { fn test_install_recursive_alias_dependencies() { let fixtures = set_up(); let package_a = get_package("A", "1.0"); - fixtures.repo.add_package(package_a.clone()).unwrap(); + fixtures.repo.add_package(package_a).unwrap(); let package_b = get_package("B", "2.0"); fixtures.repo.add_package(package_b.clone()).unwrap(); let package_a2 = get_package("A", "2.0"); @@ -2363,13 +2363,13 @@ fn test_learn_positive_literal() { let package_f1 = get_package("F", "1.0"); fixtures.repo.add_package(package_f1.clone()).unwrap(); let package_f2 = get_package("F", "2.0"); - fixtures.repo.add_package(package_f2.clone()).unwrap(); + fixtures.repo.add_package(package_f2).unwrap(); let package_g1 = get_package("G", "1.0"); - fixtures.repo.add_package(package_g1.clone()).unwrap(); + fixtures.repo.add_package(package_g1).unwrap(); let package_g2 = get_package("G", "2.0"); fixtures.repo.add_package(package_g2.clone()).unwrap(); let package_g3 = get_package("G", "3.0"); - fixtures.repo.add_package(package_g3.clone()).unwrap(); + fixtures.repo.add_package(package_g3).unwrap(); package_a .as_complete_package() diff --git a/crates/shirabe/tests/dependency_resolver/transaction_test.rs b/crates/shirabe/tests/dependency_resolver/transaction_test.rs index 3b1006ea..b6c28cc3 100644 --- a/crates/shirabe/tests/dependency_resolver/transaction_test.rs +++ b/crates/shirabe/tests/dependency_resolver/transaction_test.rs @@ -110,8 +110,8 @@ fn test_transaction_generation_and_sorting() { let dl_modifying_plugin2_dep = get_package("x/downloads-modifying2-dep", "1.0.0"); let dl_modifying_plugin2 = get_package("x/downloads-modifying2", "1.0.0"); let result_packages = vec![ - package_a.clone(), - package_a_alias.clone(), + package_a, + package_a_alias, package_b_new.clone(), package_d.clone(), package_f.clone(), @@ -216,67 +216,67 @@ fn test_transaction_generation_and_sorting() { let expected_operations = vec![ OperationEntry::Job { job: "uninstall".to_string(), - package: package_c.clone(), + package: package_c, }, OperationEntry::Job { job: "uninstall".to_string(), - package: package_e.clone(), + package: package_e, }, OperationEntry::Job { job: "markAliasUninstalled".to_string(), - package: package_e_alias.clone(), + package: package_e_alias, }, OperationEntry::Job { job: "install".to_string(), - package: dl_modifying_plugin.clone(), + package: dl_modifying_plugin, }, OperationEntry::Job { job: "install".to_string(), - package: dl_modifying_plugin2_dep.clone(), + package: dl_modifying_plugin2_dep, }, OperationEntry::Job { job: "install".to_string(), - package: dl_modifying_plugin2.clone(), + package: dl_modifying_plugin2, }, OperationEntry::Job { job: "install".to_string(), - package: plugin.clone(), + package: plugin, }, OperationEntry::Job { job: "install".to_string(), - package: plugin2_dep.clone(), + package: plugin2_dep, }, OperationEntry::Job { job: "install".to_string(), - package: plugin2.clone(), + package: plugin2, }, OperationEntry::Job { job: "install".to_string(), - package: package_a0_first.clone(), + package: package_a0_first, }, OperationEntry::Update { - from: package_b.clone(), - to: package_b_new.clone(), + from: package_b, + to: package_b_new, }, OperationEntry::Job { job: "install".to_string(), - package: package_g.clone(), + package: package_g, }, OperationEntry::Job { job: "install".to_string(), - package: package_f.clone(), + package: package_f, }, OperationEntry::Job { job: "markAliasInstalled".to_string(), - package: package_f_alias2.clone(), + package: package_f_alias2, }, OperationEntry::Job { job: "markAliasInstalled".to_string(), - package: package_f_alias1.clone(), + package: package_f_alias1, }, OperationEntry::Job { job: "install".to_string(), - package: package_d.clone(), + package: package_d, }, ]; diff --git a/crates/shirabe/tests/downloader/file_downloader_test.rs b/crates/shirabe/tests/downloader/file_downloader_test.rs index 623ac34c..65dc1a51 100644 --- a/crates/shirabe/tests/downloader/file_downloader_test.rs +++ b/crates/shirabe/tests/downloader/file_downloader_test.rs @@ -348,7 +348,7 @@ fn test_downgrade_shows_appropriate_message() { }, ); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; let downloader = FileDownloader::new( io, config, diff --git a/crates/shirabe/tests/downloader/git_downloader_test.rs b/crates/shirabe/tests/downloader/git_downloader_test.rs index 748dfb14..65907567 100644 --- a/crates/shirabe/tests/downloader/git_downloader_test.rs +++ b/crates/shirabe/tests/downloader/git_downloader_test.rs @@ -986,7 +986,7 @@ fn test_downgrade_shows_appropriate_message() { .borrow_mut() .expects(vec![Expectation::text_regex("{Downgrading .*}")], false) .unwrap(); - let io = io_mock.clone() as std::rc::Rc<std::cell::RefCell<dyn IOInterface>>; + let io = io_mock as std::rc::Rc<std::cell::RefCell<dyn IOInterface>>; let mut fs = Filesystem::new(None); fs.ensure_directory_exists(&format!("{}/.git", working_dir.path().to_string_lossy())) @@ -1064,7 +1064,7 @@ fn test_not_using_downgrading_with_references() { .borrow_mut() .expects(vec![Expectation::text_regex("{Upgrading .*}")], false) .unwrap(); - let io = io_mock.clone() as std::rc::Rc<std::cell::RefCell<dyn IOInterface>>; + let io = io_mock as std::rc::Rc<std::cell::RefCell<dyn IOInterface>>; let mut fs = Filesystem::new(None); fs.ensure_directory_exists(&format!("{}/.git", working_dir.path().to_string_lossy())) diff --git a/crates/shirabe/tests/downloader/perforce_downloader_test.rs b/crates/shirabe/tests/downloader/perforce_downloader_test.rs index c657e244..b1250906 100644 --- a/crates/shirabe/tests/downloader/perforce_downloader_test.rs +++ b/crates/shirabe/tests/downloader/perforce_downloader_test.rs @@ -141,7 +141,7 @@ fn do_install_workflow(source_ref: &'static str, expected_label: Option<String>) false, ) .unwrap(); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; let config = std::rc::Rc::new(std::cell::RefCell::new(get_config(test_path.path()))); let (process, _process_guard) = get_process_executor_mock(vec![], false, MockHandler::default()); diff --git a/crates/shirabe/tests/downloader/zip_downloader_test.rs b/crates/shirabe/tests/downloader/zip_downloader_test.rs index 8ec440d8..86f9968f 100644 --- a/crates/shirabe/tests/downloader/zip_downloader_test.rs +++ b/crates/shirabe/tests/downloader/zip_downloader_test.rs @@ -206,7 +206,7 @@ fn test_zip_archive_only_failed() { downloader.__set_zip_archive_object(Some(zip_archive)); let filename = set_up.filename.to_string_lossy().into_owned(); - let result = run(downloader.extract(set_up.package.clone(), &filename, "vendor/dir")); + let result = run(downloader.extract(set_up.package, &filename, "vendor/dir")); let e = result.expect_err("expected RuntimeException"); assert!( @@ -232,7 +232,7 @@ fn test_zip_archive_extract_only_failed() { downloader.__set_zip_archive_object(Some(zip_archive)); let filename = set_up.filename.to_string_lossy().into_owned(); - let result = run(downloader.extract(set_up.package.clone(), &filename, "vendor/dir")); + let result = run(downloader.extract(set_up.package, &filename, "vendor/dir")); let e = result.expect_err("expected RuntimeException"); assert!( @@ -260,7 +260,7 @@ fn test_zip_archive_only_good() { downloader.__set_zip_archive_object(Some(zip_archive)); let filename = set_up.filename.to_string_lossy().into_owned(); - let result = run(downloader.extract(set_up.package.clone(), &filename, "vendor/dir")); + let result = run(downloader.extract(set_up.package, &filename, "vendor/dir")); result.expect("extract should succeed"); } @@ -298,7 +298,7 @@ fn test_system_unzip_only_failed() { let downloader = make_downloader_with_process(&set_up, process); let filename = set_up.filename.to_string_lossy().into_owned(); - let result = run(downloader.extract(set_up.package.clone(), &filename, "vendor/dir")); + let result = run(downloader.extract(set_up.package, &filename, "vendor/dir")); let e = result.expect_err("expected RuntimeException"); assert!( @@ -331,7 +331,7 @@ fn test_system_unzip_only_good() { let downloader = make_downloader_with_process(&set_up, process); let filename = set_up.filename.to_string_lossy().into_owned(); - let result = run(downloader.extract(set_up.package.clone(), &filename, "vendor/dir")); + let result = run(downloader.extract(set_up.package, &filename, "vendor/dir")); result.expect("extract should succeed"); } @@ -365,7 +365,7 @@ fn test_non_windows_fallback_good() { downloader.__set_zip_archive_object(Some(zip_archive)); let filename = set_up.filename.to_string_lossy().into_owned(); - let result = run(downloader.extract(set_up.package.clone(), &filename, "vendor/dir")); + let result = run(downloader.extract(set_up.package, &filename, "vendor/dir")); result.expect("extract should succeed"); } @@ -399,7 +399,7 @@ fn test_non_windows_fallback_failed() { downloader.__set_zip_archive_object(Some(zip_archive)); let filename = set_up.filename.to_string_lossy().into_owned(); - let result = run(downloader.extract(set_up.package.clone(), &filename, "vendor/dir")); + let result = run(downloader.extract(set_up.package, &filename, "vendor/dir")); let e = result.expect_err("expected RuntimeException"); assert!( diff --git a/crates/shirabe/tests/factory_test.rs b/crates/shirabe/tests/factory_test.rs index be32dac3..3e70a7d9 100644 --- a/crates/shirabe/tests/factory_test.rs +++ b/crates/shirabe/tests/factory_test.rs @@ -48,7 +48,7 @@ fn test_default_values_are_as_expected() { .with("disable-tls", PhpMixed::Bool(true)) .build_shared(); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; Factory::create_http_downloader(io, &config, IndexMap::new()).unwrap(); } diff --git a/crates/shirabe/tests/installer/installation_manager_test.rs b/crates/shirabe/tests/installer/installation_manager_test.rs index 867e759a..3f18e925 100644 --- a/crates/shirabe/tests/installer/installation_manager_test.rs +++ b/crates/shirabe/tests/installer/installation_manager_test.rs @@ -358,7 +358,7 @@ fn test_install() { shirabe::installer::InstallationManager::new(set_up.loop_.clone(), set_up.io.clone(), None); manager.add_installer(Box::new(installer)); - let operation = InstallOperation::new(package.clone()); + let operation = InstallOperation::new(package); let mut repository = InstalledArrayRepository::new().unwrap(); run(manager.install( @@ -393,7 +393,7 @@ fn test_update_with_equal_types() { shirabe::installer::InstallationManager::new(set_up.loop_.clone(), set_up.io.clone(), None); manager.add_installer(Box::new(installer)); - let operation = UpdateOperation::new(initial.clone(), target.clone()); + let operation = UpdateOperation::new(initial, target); let mut repository = InstalledArrayRepository::new().unwrap(); run(manager.update( @@ -438,7 +438,7 @@ fn test_update_with_not_equal_types() { manager.add_installer(Box::new(lib_installer)); manager.add_installer(Box::new(bundle_installer)); - let operation = UpdateOperation::new(initial.clone(), target.clone()); + let operation = UpdateOperation::new(initial, target); let mut repository = InstalledArrayRepository::new().unwrap(); run(manager.update( @@ -469,7 +469,7 @@ fn test_uninstall() { shirabe::installer::InstallationManager::new(set_up.loop_.clone(), set_up.io.clone(), None); manager.add_installer(Box::new(installer)); - let operation = UninstallOperation::new(package.clone()); + let operation = UninstallOperation::new(package); let mut repository = InstalledArrayRepository::new().unwrap(); run(manager.uninstall( diff --git a/crates/shirabe/tests/installer/library_installer_test.rs b/crates/shirabe/tests/installer/library_installer_test.rs index f9dceb56..8a063941 100644 --- a/crates/shirabe/tests/installer/library_installer_test.rs +++ b/crates/shirabe/tests/installer/library_installer_test.rs @@ -446,7 +446,7 @@ fn test_ensure_binaries_installed() { binary_installer.expect_remove_binaries().times(0); // PHP asserts installBinaries is called once with ($package, getInstallPath, false). let expected_package = package.clone(); - let expected_install_path = expected_path.clone(); + let expected_install_path = expected_path; binary_installer .expect_install_binaries() .times(1) @@ -458,7 +458,7 @@ fn test_ensure_binaries_installed() { .returning(|_, _, _| ()); library.__set_binary_installer(std::rc::Rc::new(std::cell::RefCell::new(binary_installer))); - library.ensure_binaries_presence(package.clone()); + library.ensure_binaries_presence(package); tear_down(&mut setup); } diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 313ad215..b81ec7a4 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -1025,7 +1025,7 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) { })); } application - .add(install.clone() as std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>) + .add(install as std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>) .unwrap(); let update = std::rc::Rc::new(std::cell::RefCell::new(CommandData::new(Some( @@ -1066,7 +1066,7 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) { PhpMixed::Null, ) .unwrap(); - let installer_cl = installer.clone(); + let installer_cl = installer; let composer_cl = composer.clone(); let run_result_cl = run_result.clone(); update_ref.set_code(Box::new(move |input, _output| { @@ -1128,7 +1128,7 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) { })); } application - .add(update.clone() as std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>) + .add(update as std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>) .unwrap(); assert!( diff --git a/crates/shirabe/tests/json/json_file_test.rs b/crates/shirabe/tests/json/json_file_test.rs index 14cb1e68..195c6918 100644 --- a/crates/shirabe/tests/json/json_file_test.rs +++ b/crates/shirabe/tests/json/json_file_test.rs @@ -402,7 +402,7 @@ fn test_custom_schema_validation_lax() { ) .unwrap(); - let json = JsonFile::new(file.clone(), None, None).unwrap(); + let json = JsonFile::new(file, None, None).unwrap(); json.validate_schema(JsonFile::LAX_SCHEMA, Some(&schema)) .unwrap(); @@ -422,7 +422,7 @@ fn test_custom_schema_validation_strict() { ) .unwrap(); - let json = JsonFile::new(file.clone(), None, None).unwrap(); + let json = JsonFile::new(file, None, None).unwrap(); json.validate_schema(JsonFile::STRICT_SCHEMA, Some(&schema)) .unwrap(); 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<PackageInterfaceHandle> = 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"), ]; diff --git a/crates/shirabe/tests/repository/vcs/github_driver_test.rs b/crates/shirabe/tests/repository/vcs/github_driver_test.rs index dfdbb01e..d6674808 100644 --- a/crates/shirabe/tests/repository/vcs/github_driver_test.rs +++ b/crates/shirabe/tests/repository/vcs/github_driver_test.rs @@ -725,10 +725,7 @@ fn test_private_repository_no_interaction() { { let mut top: IndexMap<String, PhpMixed> = IndexMap::new(); let mut config_section: IndexMap<String, PhpMixed> = IndexMap::new(); - config_section.insert( - "cache-vcs-dir".to_string(), - PhpMixed::String(cache_vcs_dir.clone()), - ); + config_section.insert("cache-vcs-dir".to_string(), PhpMixed::String(cache_vcs_dir)); top.insert("config".to_string(), PhpMixed::Array(config_section)); config.borrow_mut().merge(&top, Config::SOURCE_UNKNOWN); } diff --git a/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs b/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs index 53d93993..2dd968ce 100644 --- a/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs +++ b/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs @@ -528,7 +528,7 @@ fn test_get_paginated_refs() { "http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20", None, 200, - branch_data.clone(), + branch_data, vec!["Link: <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20>; rel=\"prev\", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=1&per_page=20>; rel=\"first\", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=3&per_page=20>; rel=\"last\"".to_string()], ), ], diff --git a/crates/shirabe/tests/util/bitbucket_test.rs b/crates/shirabe/tests/util/bitbucket_test.rs index d9010ab1..e0fb9ef2 100644 --- a/crates/shirabe/tests/util/bitbucket_test.rs +++ b/crates/shirabe/tests/util/bitbucket_test.rs @@ -573,7 +573,7 @@ fn test_authorize_oauth_without_available_git_config_token() { }, ); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; let time = time(); let mut bitbucket = Bitbucket::new(io, config, Some(process), Some(http_downloader), Some(time)).unwrap(); @@ -590,7 +590,7 @@ fn test_authorize_oauth_with_available_git_config_token() { let (process, _process_guard) = get_process_executor_mock(vec![], false, MockHandler::default()); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; let time = time(); let mut bitbucket = Bitbucket::new(io, config, Some(process), Some(http_downloader), Some(time)).unwrap(); diff --git a/crates/shirabe/tests/util/gitlab_test.rs b/crates/shirabe/tests/util/gitlab_test.rs index 70aa4656..0ed386e8 100644 --- a/crates/shirabe/tests/util/gitlab_test.rs +++ b/crates/shirabe/tests/util/gitlab_test.rs @@ -92,7 +92,7 @@ fn test_username_password_authentication_flow() { let config = ConfigStubBuilder::new().build_shared(); set_up(&io_mock, &config); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; let mut gitlab = GitLab::new(io, config, None, Some(http_downloader)).unwrap(); assert!( @@ -139,7 +139,7 @@ fn test_username_password_failure() { let config = ConfigStubBuilder::new().build_shared(); set_up(&io_mock, &config); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; let mut gitlab = GitLab::new(io, config, None, Some(http_downloader)).unwrap(); let err = gitlab diff --git a/crates/shirabe/tests/util/http_downloader_test.rs b/crates/shirabe/tests/util/http_downloader_test.rs index 0839cf30..b438dca9 100644 --- a/crates/shirabe/tests/util/http_downloader_test.rs +++ b/crates/shirabe/tests/util/http_downloader_test.rs @@ -40,7 +40,7 @@ fn test_capture_authentication_params_from_url() { .with("gitlab-domains", PhpMixed::Array(IndexMap::new())) .build_shared(); - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = io_mock; Platform::put_env("COMPOSER_DISABLE_NETWORK", "1"); let fs = HttpDownloader::new(io, config, IndexMap::new(), false); |