actionlint.rs golangci_lint.rs goreleaser.rs govulnchec.rs ireturn.rs…

… mdbook.rs mdbook_linkcheck.rs mod.rs node_prune.rs nodejs.rs npm.rs npx.rs ripgrep.rs scc.rs shellcheck.rs shfmt.rs staticcheck.rs tikibase.rs requested_version.rs find_global_install.rs mod.rs event.rs main.rs capture_output.rs detect_output.rs stream_output.rs yard.rs

src/applications/actionlint.rs

@@ -1,6 +1,6 @@
 use super::{AnalyzeResult, AppDefinition};
 use crate::configuration::Version;
-use crate::executables::{self, Executable, RunMethod};
+use crate::executables::{Executable, RunMethod};
 use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};

src/applications/golangci_lint.rs

@@ -76,7 +76,7 @@ mod tests {
     use crate::applications::golangci_lint::GolangCiLint;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/goreleaser.rs

@@ -1,6 +1,6 @@
 use super::{AnalyzeResult, AppDefinition};
 use crate::configuration::Version;
-use crate::executables::{self, Executable, RunMethod};
+use crate::executables::{Executable, RunMethod};
 use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
@@ -78,7 +78,7 @@ mod tests {
     use crate::applications::goreleaser::Goreleaser;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/govulnchec.rs

@@ -77,7 +77,7 @@ impl AppDefinition for Govulncheck {
 
 #[cfg(test)]
 mod tests {
-  use crate::executables::{self, RunMethod};
+  use crate::executables::RunMethod;
 
   #[test]
   fn install_methods() {

src/applications/ireturn.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, Log};
+use crate::Log;
 use const_format::formatcp;
 
 pub(crate) struct Ireturn {}
@@ -77,7 +77,7 @@ mod tests {
     use crate::applications::ireturn::Ireturn;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/mdbook.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, regexp, Log};
+use crate::{regexp, Log};
 use big_s::S;
 use const_format::formatcp;
 
@@ -87,7 +87,7 @@ mod tests {
     use crate::applications::mdbook::MdBook;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/mdbook_linkcheck.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, regexp, Log};
+use crate::{regexp, Log};
 use big_s::S;
 use const_format::formatcp;
 
@@ -83,7 +83,7 @@ mod tests {
     use crate::applications::mdbook_linkcheck::MdBookLinkCheck;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/mod.rs

@@ -30,7 +30,7 @@ mod staticcheck;
 mod tikibase;
 
 use crate::configuration::Version;
-use crate::executables::{self, Executable, ExecutableArgs, ExecutableNameUnix, RunMethod};
+use crate::executables::{Executable, ExecutableArgs, ExecutableNameUnix, RunMethod};
 use crate::platform::Platform;
 use crate::prelude::*;
 use crate::Log;

src/applications/node_prune.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_tags;
 use crate::installation::Method;
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, Log};
+use crate::Log;
 use const_format::formatcp;
 
 pub(crate) struct NodePrune {}
@@ -77,7 +77,7 @@ mod tests {
     use crate::applications::node_prune::NodePrune;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::Method;
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/nodejs.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, regexp, Log};
+use crate::{regexp, Log};
 use std::path;
 
 pub(crate) struct NodeJS {}
@@ -96,7 +96,6 @@ mod tests {
     use crate::applications::nodejs::NodeJS;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/npm.rs

@@ -4,7 +4,7 @@ use crate::configuration::Version;
 use crate::executables::{Executable, ExecutableArgs, RunMethod};
 use crate::platform::Platform;
 use crate::prelude::*;
-use crate::{executables, Log};
+use crate::Log;
 
 pub(crate) struct Npm {}
 
@@ -60,7 +60,6 @@ mod tests {
     use crate::applications::npm::Npm;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables;
     use crate::executables::ExecutableArgs;
     use crate::platform::{Cpu, Os, Platform};
 

src/applications/npx.rs

@@ -4,7 +4,7 @@ use crate::configuration::Version;
 use crate::executables::{Executable, ExecutableArgs, RunMethod};
 use crate::platform::Platform;
 use crate::prelude::*;
-use crate::{executables, Log};
+use crate::Log;
 
 pub(crate) struct Npx {}
 
@@ -60,7 +60,7 @@ mod tests {
     use crate::applications::npx::Npx;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, ExecutableArgs};
+    use crate::executables::ExecutableArgs;
     use crate::platform::{Cpu, Os, Platform};
 
     #[test]

src/applications/ripgrep.rs

@@ -87,7 +87,7 @@ mod tests {
     use crate::applications::ripgrep::RipGrep;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/scc.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, regexp, Log};
+use crate::{regexp, Log};
 use const_format::formatcp;
 
 pub(crate) struct Scc {}
@@ -81,7 +81,7 @@ mod tests {
     use crate::applications::scc::Scc;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/shellcheck.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, regexp, Log};
+use crate::{regexp, Log};
 
 pub(crate) struct ShellCheck {}
 
@@ -80,7 +80,7 @@ mod tests {
     use crate::applications::shellcheck::ShellCheck;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/shfmt.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::Method;
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, regexp, Log};
+use crate::{regexp, Log};
 use const_format::formatcp;
 
 pub(crate) struct Shfmt {}
@@ -84,7 +84,7 @@ mod tests {
     use crate::applications::shfmt::Shfmt;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::Method;
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/staticcheck.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, Log};
+use crate::Log;
 use big_s::S;
 
 const ORG: &str = "dominikh";
@@ -73,7 +73,7 @@ mod tests {
     use crate::applications::staticcheck::StaticCheck;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/applications/tikibase.rs

@@ -5,7 +5,7 @@ use crate::hosting::github_releases;
 use crate::installation::{BinFolder, Method};
 use crate::platform::{Cpu, Os, Platform};
 use crate::prelude::*;
-use crate::{executables, regexp, Log};
+use crate::{regexp, Log};
 use const_format::formatcp;
 
 pub(crate) struct Tikibase {}
@@ -80,7 +80,7 @@ mod tests {
     use crate::applications::tikibase::Tikibase;
     use crate::applications::AppDefinition;
     use crate::configuration::Version;
-    use crate::executables::{self, RunMethod};
+    use crate::executables::RunMethod;
     use crate::installation::{BinFolder, Method};
     use crate::platform::{Cpu, Os, Platform};
     use big_s::S;

src/configuration/requested_version.rs

@@ -71,7 +71,7 @@ mod tests {
   mod parse {
     use crate::applications::{AnalyzeResult, AppDefinition};
     use crate::configuration::Version;
-    use crate::executables::{self, Executable, ExecutableNameUnix, RunMethod};
+    use crate::executables::{Executable, ExecutableNameUnix, RunMethod};
     use crate::logging::Log;
     use crate::platform::Platform;
     use crate::prelude::*;

src/filesystem/find_global_install.rs

@@ -1,5 +1,5 @@
-use crate::logging::{Event, Log};
 use crate::executables::{Executable, ExecutableNamePlatform};
+use crate::logging::{Event, Log};
 use which::which_global;
 
 pub(crate) fn find_global_install(binary_name: &ExecutableNamePlatform, log: Log) -> Option<Executable> {

src/installation/mod.rs

@@ -7,10 +7,10 @@ mod download_executable;
 
 use crate::applications::AppDefinition;
 use crate::configuration::{self, Version};
+use crate::executables::ExecutableNamePlatform;
 use crate::logging::Log;
 use crate::platform::Platform;
 use crate::prelude::*;
-use crate::executables::ExecutableNamePlatform;
 use crate::yard::Yard;
 use std::fmt::{Debug, Display};
 use std::path::{Path, PathBuf};

src/logging/event.rs

@@ -1,7 +1,7 @@
 use crate::applications::ApplicationName;
 use crate::configuration::Version;
-use crate::installation::Method;
 use crate::executables::ExecutableNamePlatform;
+use crate::installation::Method;
 use std::borrow::Cow;
 use std::path::Path;
 

src/main.rs

@@ -5,14 +5,14 @@ mod commands;
 mod configuration;
 mod download;
 mod error;
+mod executables;
 mod filesystem;
 mod hosting;
 mod installation;
 mod logging;
 mod platform;
 mod prelude;
 mod regexp;
-mod executables;
 mod subshell;
 mod yard;
 

src/subshell/capture_output.rs

@@ -1,6 +1,6 @@
 use super::add_paths;
-use crate::prelude::*;
 use crate::executables::Executable;
+use crate::prelude::*;
 use std::process::Command;
 
 /// executes the given executable with the given args, returns the captured output (STDOUT and STDERR)

src/subshell/detect_output.rs

@@ -1,7 +1,7 @@
 use super::{add_paths, exit_status_to_code, render_call};
 use crate::cli;
-use crate::prelude::*;
 use crate::executables::{Executable, ExecutableCall};
+use crate::prelude::*;
 use std::io::{self, BufRead, BufReader, Read};
 use std::process::{self, Child, Command, ExitCode, Stdio};
 use std::sync::mpsc;

src/subshell/stream_output.rs

@@ -1,6 +1,6 @@
 use super::{add_paths, exit_status_to_code, render_call};
-use crate::prelude::*;
 use crate::executables::{Executable, ExecutableCall};
+use crate::prelude::*;
 use std::process::{Command, ExitCode};
 
 /// Runs the given executable with the given arguments.

src/yard/yard.rs

@@ -1,11 +1,11 @@
 use super::root_path;
 use crate::applications::{AppDefinition, ApplicationName};
 use crate::configuration::Version;
+use crate::executables::{Executable, ExecutableNameUnix};
 use crate::installation::BinFolder;
 use crate::logging::{Event, Log};
 use crate::platform::Platform;
 use crate::prelude::*;
-use crate::executables::{Executable, ExecutableNameUnix};
 use std::fs::{self, File};
 use std::path::{Path, PathBuf};