Merge #462

462: add cross metadata r=reitermarkus a=Emilgardis

this will enable running `cargo metadata` in the container instead of on the host.

Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

src/cargo.rs

@@ -17,6 +17,7 @@ pub enum Subcommand {
     Bench,
     Deb,
     Clippy,
+    Metadata,
 }
 
 impl Subcommand {
@@ -33,6 +34,13 @@ impl Subcommand {
             _ => false,
         }
     }
+
+    pub fn needs_target_in_command(self) -> bool {
+        match self {
+            Subcommand::Metadata => false,
+            _ => true,
+        }
+    }
 }
 
 impl<'a> From<&'a str> for Subcommand {
@@ -47,6 +55,7 @@ impl<'a> From<&'a str> for Subcommand {
             "bench" => Subcommand::Bench,
             "deb" => Subcommand::Deb,
             "clippy" => Subcommand::Clippy,
+            "metadata" => Subcommand::Metadata,
             _ => Subcommand::Other,
         }
     }

src/main.rs

@@ -278,6 +278,23 @@ fn run() -> Result<ExitStatus> {
                     false
                 },
             };
+            
+            let filtered_args = if args.subcommand.map_or(false, |s| !s.needs_target_in_command()) {
+                let mut filtered_args = Vec::new();
+                let mut args_iter = args.all.clone().into_iter();
+                while let Some(arg) = args_iter.next() {
+                    if arg == "--target" {
+                        args_iter.next();
+                    } else if arg.starts_with("--target=") {
+                        // NOOP
+                    } else {
+                        filtered_args.push(arg)
+                    }
+                }
+                filtered_args
+            } else {
+                args.all.clone()
+            };
 
             if image_exists && target.needs_docker() &&
                args.subcommand.map(|sc| sc.needs_docker()).unwrap_or(false) {
@@ -289,7 +306,7 @@ fn run() -> Result<ExitStatus> {
                 }
 
                 return docker::run(&target,
-                                   &args.all,
+                                   &filtered_args,
                                    &args.target_dir,
                                    &root,
                                    toml.as_ref(),