Merge pull request #850 from foresterre/refactor/external-commands

refactor: Emphasise command module is for external cli calls

src/check/rustup_toolchain_check.rs

@@ -1,9 +1,9 @@
 use crate::check::Check;
-use crate::command::cargo_command::CargoCommand;
-use crate::command::rustup_command::RustupCommand;
 use crate::context::EnvironmentContext;
 use crate::download::{DownloadToolchain, ToolchainDownloader};
 use crate::error::{IoError, IoErrorSource};
+use crate::external_command::cargo_command::CargoCommand;
+use crate::external_command::rustup_command::RustupCommand;
 use crate::lockfile::LockfileHandler;
 use crate::reporter::event::{CheckMethod, CheckResult, CheckToolchain, Method};
 use crate::toolchain::ToolchainSpec;

src/context/find.rs

@@ -1,11 +1,11 @@
 use crate::check::RunCommand;
 use crate::cli::CargoMsrvOpts;
-use crate::command::cargo_command::CargoCommand;
 use crate::context::{
     CheckCommandContext, EnvironmentContext, RustReleasesContext, SearchMethod, ToolchainContext,
     UserOutputContext,
 };
 use crate::error::CargoMSRVError;
+use crate::external_command::cargo_command::CargoCommand;
 use std::convert::{TryFrom, TryInto};
 
 #[derive(Debug)]

src/context/verify.rs

@@ -5,8 +5,8 @@ use crate::context::{
 };
 
 use crate::check::RunCommand;
-use crate::command::cargo_command::CargoCommand;
 use crate::error::CargoMSRVError;
+use crate::external_command::cargo_command::CargoCommand;
 use crate::sub_command::verify::RustVersion;
 use std::convert::{TryFrom, TryInto};
 

src/default_target.rs

@@ -1,5 +1,5 @@
-use crate::command::rustup_command::RustupCommand;
 use crate::error::{CargoMSRVError, TResult};
+use crate::external_command::rustup_command::RustupCommand;
 
 /// Uses the `.rustup/settings.toml` file to determine the default target (aka the
 /// `default_host_triple`) if not set by a user.

src/download.rs

@@ -1,5 +1,5 @@
-use crate::command::rustup_command::RustupCommand;
 use crate::error::RustupInstallFailed;
+use crate::external_command::rustup_command::RustupCommand;
 use crate::reporter::event::SetupToolchain;
 use crate::toolchain::ToolchainSpec;
 use crate::{CargoMSRVError, Reporter, TResult};

src/command/cargo_command.rs → src/external_command/cargo_command.rs

@@ -34,7 +34,7 @@ impl CargoCommand {
     /// Intended to be used in conjunction with [`RunCommand`] and/or [`RustupCommand`].
     ///
     /// [`RunCommand`]: crate::check::RunCommand
-    /// [`RustupCommand`]: crate::command::rustup_command::RustupCommand
+    /// [`RustupCommand`]: crate::external_command::rustup_command::RustupCommand
     // Currently we don't invoke it from here directly, but we might eventually, if
     // we want to also provide some nicer structs around parsing. However compared to
     // some other cargo subcommand crates, we also (currently) need rustup, so the invocation
@@ -75,7 +75,7 @@ impl CargoCommand {
 
 #[cfg(test)]
 mod tests {
-    use crate::command::cargo_command::CargoCommand;
+    use crate::external_command::cargo_command::CargoCommand;
 
     #[test]
     fn set_features_none() {

src/lib.rs

@@ -41,11 +41,11 @@ pub mod toolchain;
 
 pub(crate) mod combinators;
 
-mod command;
 mod context;
 pub(crate) mod default_target;
 pub(crate) mod dependency_graph;
 pub(crate) mod download;
+mod external_command;
 pub(crate) mod formatting;
 pub(crate) mod lockfile;
 pub(crate) mod log_level;