Merge pull request #1092 from SierraSoftworks/fix/nix

fix: Resolve Nix flake check failures
SierraSoftworks · Mar 17, 2024 · d1113cb · d1113cb
2 parents 96a4177 + f591a88
commit d1113cb
Show file tree

Hide file tree

Showing 24 changed files with 578 additions and 467 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/flake.lock b/flake.lock
diff --git a/src/commands/clone.rs b/src/commands/clone.rs
@@ -1,8 +1,7 @@
-use super::Command;
 use super::*;
 use crate::core::Target;
 use crate::tasks::*;
-use clap::{Arg, ArgMatches};
+use clap::Arg;
 
 pub struct CloneCommand;
 

diff --git a/src/commands/config.rs b/src/commands/config.rs
@@ -1,9 +1,8 @@
 use crate::core::features;
 
 use super::async_trait;
-use super::CommandRunnable;
 use super::*;
-use clap::{Arg, ArgMatches};
+use clap::Arg;
 use online::registry::Registry;
 
 pub struct ConfigCommand;
@@ -331,7 +330,6 @@ mod tests {
     use super::core::Config;
     use super::*;
     use crate::test::get_dev_dir;
-    use clap::ArgMatches;
     use complete::helpers::test_completions_with_config;
 
     #[tokio::test]
@@ -377,7 +375,7 @@ mod tests {
             Err(err) => panic!("{}", err.message()),
         }
 
-        println!("{}", console.to_string());
+        println!("{}", console);
         assert!(
             console.to_string().contains("apps/bash\n"),
             "the output should contain some apps"
@@ -408,7 +406,7 @@ mod tests {
             Err(err) => panic!("{}", err.message()),
         }
 
-        println!("{}", console.to_string());
+        println!("{}", console);
         assert!(
             console.to_string().contains("Applying Bash\n"),
             "the output should explain which config is being applied"
@@ -482,7 +480,7 @@ aliases:
             Err(err) => panic!("{}", err.message()),
         }
 
-        println!("{}", console.to_string());
+        println!("{}", console);
         assert!(
             console
                 .to_string()
@@ -524,7 +522,7 @@ aliases:
             Err(err) => panic!("{}", err.message()),
         }
 
-        println!("{}", console.to_string());
+        println!("{}", console);
         assert!(
             console
                 .to_string()

diff --git a/src/commands/fix.rs b/src/commands/fix.rs
@@ -1,7 +1,6 @@
-use super::super::errors;
 use super::*;
 use crate::{search, tasks::*};
-use clap::{Arg, ArgMatches};
+use clap::Arg;
 
 pub struct FixCommand;
 crate::command!(FixCommand);

diff --git a/src/commands/ignore.rs b/src/commands/ignore.rs
@@ -1,8 +1,7 @@
 use super::async_trait;
 use super::online::gitignore;
-use super::CommandRunnable;
 use super::*;
-use clap::{value_parser, Arg, ArgMatches};
+use clap::{value_parser, Arg};
 
 pub struct IgnoreCommand;
 crate::command!(IgnoreCommand);

diff --git a/src/commands/info.rs b/src/commands/info.rs
@@ -1,7 +1,6 @@
-use super::super::errors;
 use super::core::Target;
 use super::*;
-use clap::{Arg, ArgMatches};
+use clap::Arg;
 
 pub struct InfoCommand;
 crate::command!(InfoCommand);

diff --git a/src/commands/new.rs b/src/commands/new.rs
@@ -1,7 +1,6 @@
-use super::super::errors;
 use super::*;
 use crate::{core::features, tasks::*};
-use clap::{Arg, ArgMatches};
+use clap::Arg;
 
 pub struct NewCommand;
 crate::command!(NewCommand);

diff --git a/src/commands/open.rs b/src/commands/open.rs
@@ -1,10 +1,9 @@
-use super::CommandRunnable;
 use super::*;
 use crate::core::features;
 use crate::tasks::*;
 use crate::update::{GitHubSource, Release, ReleaseVariant};
 use crate::{core::Target, update::UpdateManager};
-use clap::{Arg, ArgMatches};
+use clap::Arg;
 
 pub struct OpenCommand;
 crate::command!(OpenCommand);

diff --git a/src/commands/prune.rs b/src/commands/prune.rs
@@ -1,4 +1,3 @@
-use super::super::errors;
 use super::*;
 use crate::core::Target;
 use crate::git;
@@ -114,7 +113,7 @@ mod tests {
     use super::*;
     use crate::core::builder::CoreBuilderWithConfig;
     use crate::core::*;
-    use crate::tasks::{self, Task};
+    use crate::tasks::Task;
     use complete::helpers::test_completions_with_core;
     use tempfile::tempdir;
 

diff --git a/src/commands/remove.rs b/src/commands/remove.rs
@@ -1,7 +1,6 @@
-use super::CommandRunnable;
 use super::*;
 use crate::core::Target;
-use clap::{Arg, ArgMatches};
+use clap::Arg;
 
 pub struct RemoveCommand;
 crate::command!(RemoveCommand);

diff --git a/src/commands/scratch.rs b/src/commands/scratch.rs
@@ -1,7 +1,7 @@
 use super::async_trait;
 use super::*;
-use super::{core::Target, tasks, tasks::Task, CommandRunnable};
-use clap::{Arg, ArgMatches};
+use super::{core::Target, tasks::Task};
+use clap::Arg;
 
 pub struct ScratchCommand;
 crate::command!(ScratchCommand);

diff --git a/src/commands/switch.rs b/src/commands/switch.rs
@@ -1,4 +1,3 @@
-use super::super::errors;
 use super::*;
 use crate::core::Target;
 use crate::git;

diff --git a/src/core/auth.rs b/src/core/auth.rs
@@ -1,5 +1,4 @@
 use super::*;
-use std::sync::Arc;
 
 #[cfg(feature = "auth")]
 #[cfg(test)]

diff --git a/src/core/config.rs b/src/core/config.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
+use std::env::consts::OS;
 use std::path::PathBuf;
 use std::{collections::HashMap, path::Path};
-use std::{env::consts::OS, vec::Vec};
 use std::{path, sync::Arc};
 
 use super::super::errors;
@@ -78,16 +78,16 @@ impl Config {
             into.config_file = Some(path)
         }
         if from.dev_directory.components().count() > 0 {
-            into.dev_directory = from.dev_directory.clone();
+            into.dev_directory.clone_from(&from.dev_directory);
         }
         if let Some(path) = from.scratch_directory {
             into.scratch_directory = Some(path)
         }
         if !from.services.is_empty() {
-            into.services = from.services.clone();
+            into.services.clone_from(&from.services);
         }
         if !from.apps.is_empty() {
-            into.apps = from.apps.clone();
+            into.apps.clone_from(&from.apps);
         }
 
         into.features = features::Features::builder()

diff --git a/src/core/launcher.rs b/src/core/launcher.rs
@@ -14,9 +14,6 @@ use mockall::automock;
 use std::sync::Arc;
 use tokio::process::Command;
 
-#[cfg(unix)]
-use std::convert::TryInto;
-
 #[async_trait::async_trait]
 #[cfg_attr(test, automock)]
 pub trait Launcher: Send + Sync {

diff --git a/src/fs/mod.rs b/src/fs/mod.rs
@@ -23,7 +23,6 @@ pub fn to_native_path<T: Into<PathBuf>>(path: T) -> std::path::PathBuf {
 mod tests {
     use super::*;
     use crate::test::get_dev_dir;
-    use std::path::PathBuf;
 
     #[test]
     fn test_to_native_path() {

diff --git a/src/online/gitignore.rs b/src/online/gitignore.rs
@@ -151,7 +151,6 @@ impl GitIgnoreFileSection {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::core::Core;
 
     #[tokio::test]
     #[cfg_attr(feature = "pure-tests", ignore)]

diff --git a/src/tasks/git_checkout.rs b/src/tasks/git_checkout.rs
@@ -26,7 +26,6 @@ impl<'a> Task for GitCheckout<'a> {
 mod tests {
     use super::*;
     use crate::core::*;
-    use crate::tasks::GitInit;
     use tempfile::tempdir;
 
     #[tokio::test]

diff --git a/src/tasks/git_init.rs b/src/tasks/git_init.rs
@@ -31,7 +31,6 @@ impl Task for GitInit {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::core;
     use crate::core::*;
     use tempfile::tempdir;
 

diff --git a/src/tasks/git_remote.rs b/src/tasks/git_remote.rs
@@ -46,7 +46,6 @@ impl<'a> Task for GitRemote<'a> {
 mod tests {
     use super::*;
     use crate::core::*;
-    use crate::tasks::GitInit;
     use tempfile::tempdir;
 
     #[tokio::test]

diff --git a/src/tasks/git_switch.rs b/src/tasks/git_switch.rs
@@ -37,7 +37,6 @@ impl Task for GitSwitch {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::tasks::GitInit;
     use tempfile::tempdir;
 
     #[tokio::test]

diff --git a/src/tasks/sequence.rs b/src/tasks/sequence.rs
@@ -38,7 +38,6 @@ impl Task for Sequence {
 
 #[cfg(test)]
 mod tests {
-    use super::super::TestTask;
     use super::*;
     use crate::core::*;
 

diff --git a/src/tasks/write_file.rs b/src/tasks/write_file.rs
@@ -59,7 +59,6 @@ impl<'a> Task for WriteFile<'a> {
 mod tests {
     use super::*;
     use crate::core::*;
-    use std::path::PathBuf;
     use tempfile::tempdir;
 
     #[tokio::test]