6 files changed, 10 insertions, 19 deletions
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs
index 01da89d..c88b47b 100644
--- a/crates/shirabe/src/command/archive_command.rs
+++ b/crates/shirabe/src/command/archive_command.rs
@@ -184,7 +184,7 @@ impl ArchiveCommand {
             let download_manager =
                 factory.create_download_manager(io, config, &http_downloader, &process, None)?;
             let loop_ = std::rc::Rc::new(std::cell::RefCell::new(Loop::new(
-                std::rc::Rc::clone(&http_downloader),
+                http_downloader.clone(),
                 Some(process),
             )));
             owned_archive_manager =
diff --git a/crates/shirabe/src/command/base_config_command.rs b/crates/shirabe/src/command/base_config_command.rs
index 2da93dc..85e68b3 100644
--- a/crates/shirabe/src/command/base_config_command.rs
+++ b/crates/shirabe/src/command/base_config_command.rs
@@ -41,7 +41,7 @@ pub trait BaseConfigCommand: BaseCommand {
         *self.config_mut() = Some(std::rc::Rc::new(std::cell::RefCell::new(
             Factory::create_config(Some(io.as_ref()), None)?,
         )));
-        let config_rc = std::rc::Rc::clone(self.config().unwrap());
+        let config_rc = self.config().unwrap().clone();
 
         // When using --global flag, set baseDir to home directory for correct absolute path resolution
         if input.get_option("global").as_bool().unwrap_or(false) {
diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs
index c0093e8..d4b4a1a 100644
--- a/crates/shirabe/src/command/create_project_command.rs
+++ b/crates/shirabe/src/command/create_project_command.rs
@@ -728,14 +728,10 @@ impl CreateProjectCommand {
             // TODO(phase-b): default_repos needs &mut RepositoryManager but we hold &RepositoryManager.
             let _ = rm;
             repository_set.add_repository(Box::new(CompositeRepository::new(
-                RepositoryFactory::default_repos(
-                    Some(io),
-                    Some(std::rc::Rc::clone(&config)),
-                    None,
-                )?
-                .into_iter()
-                .map(|(_, v)| v)
-                .collect(),
+                RepositoryFactory::default_repos(Some(io), Some(config.clone()), None)?
+                    .into_iter()
+                    .map(|(_, v)| v)
+                    .collect(),
             )));
         } else {
             for repo in repositories.unwrap() {
diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs
index e721e52..7a16699 100644
--- a/crates/shirabe/src/command/diagnose_command.rs
+++ b/crates/shirabe/src/command/diagnose_command.rs
@@ -856,10 +856,8 @@ impl DiagnoseCommand {
             return Ok(result);
         }
 
-        let mut versions_util = Versions::new(
-            std::rc::Rc::clone(config),
-            self.http_downloader.clone().unwrap(),
-        );
+        let mut versions_util =
+            Versions::new(config.clone(), self.http_downloader.clone().unwrap());
         let latest = match versions_util.get_latest(None) {
             Ok(Ok(l)) => l,
             Ok(Err(e)) => {
diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs
index 8645ce1..80d8b01 100644
--- a/crates/shirabe/src/command/self_update_command.rs
+++ b/crates/shirabe/src/command/self_update_command.rs
@@ -135,10 +135,7 @@ impl SelfUpdateCommand {
             Factory::create_http_downloader(io, &config, indexmap::IndexMap::new())?,
         ));
 
-        let mut versions_util = Versions::new(
-            std::rc::Rc::clone(&config),
-            std::rc::Rc::clone(&http_downloader),
-        );
+        let mut versions_util = Versions::new(config.clone(), http_downloader.clone());
 
         // switch channel if requested
         let mut requested_channel: Option<String> = None;
diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs
index 83a21b8..190884a 100644
--- a/crates/shirabe/src/command/status_command.rs
+++ b/crates/shirabe/src/command/status_command.rs
@@ -104,7 +104,7 @@ impl StatusCommand {
             .unwrap_or_else(|| std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(io))));
         let mut guesser = VersionGuesser::new(
             composer.get_config(),
-            std::rc::Rc::clone(&process_executor),
+            process_executor.clone(),
             parser.clone(),
             Some(io_box.clone_box()),
         );