Remove ops::run_os, change ops::run to take &[OsString] directly.

rust-lang · Apr 15, 2019 · 6d066a6 · 6d066a6
1 parent 3ab8407
commit 6d066a6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/bin/cargo/commands/run.rs b/src/bin/cargo/commands/run.rs
@@ -72,7 +72,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
             };
         }
     };
-    match ops::run_os(&ws, &compile_opts, &values_os(args, "args"))? {
+    match ops::run(&ws, &compile_opts, &values_os(args, "args"))? {
         None => Ok(()),
         Some(err) => {
             // If we never actually spawned the process then that sounds pretty

diff --git a/src/cargo/ops/cargo_run.rs b/src/cargo/ops/cargo_run.rs
@@ -7,15 +7,6 @@ use crate::ops;
 use crate::util::{CargoResult, ProcessError};
 
 pub fn run(
-    ws: &Workspace<'_>,
-    options: &ops::CompileOptions<'_>,
-    args: &[String],
-) -> CargoResult<Option<ProcessError>> {
-    let osargs: Vec<OsString> = args.iter().map(|s| OsString::from(s)).collect();
-    run_os(ws, options, osargs.as_slice())
-}
-
-pub fn run_os(
     ws: &Workspace<'_>,
     options: &ops::CompileOptions<'_>,
     args: &[OsString],

diff --git a/src/cargo/ops/mod.rs b/src/cargo/ops/mod.rs
@@ -12,7 +12,7 @@ pub use self::cargo_output_metadata::{output_metadata, ExportInfo, OutputMetadat
 pub use self::cargo_package::{package, PackageOpts};
 pub use self::cargo_pkgid::pkgid;
 pub use self::cargo_read_manifest::{read_package, read_packages};
-pub use self::cargo_run::{run, run_os};
+pub use self::cargo_run::run;
 pub use self::cargo_test::{run_benches, run_tests, TestOptions};
 pub use self::cargo_uninstall::uninstall;
 pub use self::fix::{fix, fix_maybe_exec_rustc, FixOptions};