From 27d00055df8691a6bd99aaf38633a7338b16cc6a Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 11 Jul 2026 16:33:05 +0900 Subject: chore: use fully-qualified name for Rc/RefCell --- .../tests/package/version/version_guesser_test.rs | 14 ++++++-------- .../tests/package/version/version_selector_test.rs | 18 +++++++++--------- 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'crates/shirabe/tests/package/version') diff --git a/crates/shirabe/tests/package/version/version_guesser_test.rs b/crates/shirabe/tests/package/version/version_guesser_test.rs index 1a3f23c1..92d5e90b 100644 --- a/crates/shirabe/tests/package/version/version_guesser_test.rs +++ b/crates/shirabe/tests/package/version/version_guesser_test.rs @@ -9,8 +9,6 @@ use shirabe::util::Git as GitUtil; use shirabe::util::platform::Platform; use shirabe::util::process_executor::{MockExpectation, MockHandler, ProcessExecutor}; use shirabe_php_shim::PhpMixed; -use std::cell::RefCell; -use std::rc::Rc; // Mirrors VersionGuesserTest::setUp/tearDown: reset GitUtil's cached `version` // static so each test re-runs `git --version` against its own mock. @@ -27,19 +25,19 @@ impl Drop for TearDown { } // `$config = new Config; $config->merge(['repositories' => ['packagist' => false]]);` -fn make_config() -> Rc> { +fn make_config() -> std::rc::Rc> { let mut config = Config::new(true, None); let mut repositories: IndexMap = IndexMap::new(); repositories.insert("packagist".to_string(), PhpMixed::Bool(false)); let mut merge: IndexMap = IndexMap::new(); merge.insert("repositories".to_string(), PhpMixed::Array(repositories)); config.merge(&merge, Config::SOURCE_UNKNOWN); - Rc::new(RefCell::new(config)) + std::rc::Rc::new(std::cell::RefCell::new(config)) } fn make_guesser( - config: Rc>, - process: Rc>, + config: std::rc::Rc>, + process: std::rc::Rc>, ) -> VersionGuesser { VersionGuesser::new(config, process, VersionParser::new(), None) } @@ -615,8 +613,8 @@ fn test_get_root_version_from_env() { for (env, expected_version) in root_env_versions { Platform::put_env("COMPOSER_ROOT_VERSION", env); - let config = Rc::new(RefCell::new(Config::new(true, None))); - let process = Rc::new(RefCell::new(ProcessExecutor::new(None))); + let config = std::rc::Rc::new(std::cell::RefCell::new(Config::new(true, None))); + let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(None))); let guesser = VersionGuesser::new(config, process, VersionParser::new(), None); assert_eq!( expected_version, diff --git a/crates/shirabe/tests/package/version/version_selector_test.rs b/crates/shirabe/tests/package/version/version_selector_test.rs index 3a0c7019..70874bcb 100644 --- a/crates/shirabe/tests/package/version/version_selector_test.rs +++ b/crates/shirabe/tests/package/version/version_selector_test.rs @@ -19,8 +19,6 @@ use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::PhpMixed; use shirabe_php_shim::{PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION}; use shirabe_semver::constraint::AnyConstraint; -use std::cell::RefCell; -use std::rc::Rc; mockall::mock! { RepositorySet {} @@ -41,8 +39,10 @@ impl std::fmt::Debug for MockRepositorySet { } } -fn into_seam(mock: MockRepositorySet) -> Rc> { - Rc::new(RefCell::new(mock)) +fn into_seam( + mock: MockRepositorySet, +) -> std::rc::Rc> { + std::rc::Rc::new(std::cell::RefCell::new(mock)) } /// Mirrors PHPUnit `assertSame($expected, $best)`: object identity, not value equality. @@ -77,7 +77,7 @@ fn find_best( dyn shirabe::filter::platform_requirement_filter::PlatformRequirementFilterInterface, >, >, - io: Option>>, + io: Option>>, ) -> Option { version_selector .find_best_candidate( @@ -159,10 +159,10 @@ fn test_latest_version_is_returned_that_matches_php_requirements() { let mut version_selector = VersionSelector::new(into_seam(repository_set), Some(&mut platform)).unwrap(); - let io = Rc::new(RefCell::new( + let io = std::rc::Rc::new(std::cell::RefCell::new( BufferIO::new(String::new(), output_interface::VERBOSITY_NORMAL, None).unwrap(), )); - let io_dyn: Rc> = io.clone(); + let io_dyn: std::rc::Rc> = io.clone(); let best = find_best( &mut version_selector, package_name, @@ -180,10 +180,10 @@ fn test_latest_version_is_returned_that_matches_php_requirements() { io.borrow().get_output() ); - let io = Rc::new(RefCell::new( + let io = std::rc::Rc::new(std::cell::RefCell::new( BufferIO::new(String::new(), output_interface::VERBOSITY_VERBOSE, None).unwrap(), )); - let io_dyn: Rc> = io.clone(); + let io_dyn: std::rc::Rc> = io.clone(); let best = find_best( &mut version_selector, package_name, -- cgit v1.3.1