Cannot pass cargo test -- args with default target

[flaviojs]

Checklist

• I've looked through the issues and pull requests for similar reports

Describe your issue

I have a Cross.toml with a default target to avoid having to pass the target argument manually:

[build]
default-target = "powerpc-unknown-linux-gnu"

While running cross test -vv -- --show-output I get:

(...cut...)
+ rustup target list --toolchain nightly-x86_64-unknown-linux-gnu
+ rustup component list --toolchain nightly-x86_64-unknown-linux-gnu
+ /usr/bin/podman
+ /usr/bin/podman run --userns host (...cut...) cargo test -vv -- --show-output --target powerpc-unknown-linux-gnu'
(...cut...)
     Running `(...cut...) --show-output --target powerpc-unknown-linux-gnu`
error: Unrecognized option: 'target'
error: test failed, to rerun pass `--lib

so the real problem is cross adding "--target powerpc-unknown-linux-gnu" to cargo test after the "--" argument.

cross should place the target argument before "--" for any cargo command that supports "--", like cargo test.

What target(s) are you cross-compiling for?

powerpc-unknown-linux-gnu

Which operating system is the host (e.g computer cross is on) running?

• macOS
• Windows
• Linux / BSD
• other OS (specify in description)

What architecture is the host?

• x86_64 / AMD64
• arm32
• arm64 (including Mac M1)

What container engine is cross using?

• docker
• podman
• other container engine (specify in description)

cross version

cross 0.2.5

Example

No response

Additional information / notes

No response

[flaviojs]

I'm not sure what the correct implementation should be:

Option 1

"--target" is the first cargo argument

in cross::get_filtered_args:

    // Make sure --target is present
    } else if !args.cargo_args.iter().any(|a| a.starts_with("--target")) {
        let mut args_with_target = vec!["--target".to_owned(), add_libc(target.triple())];
        args_with_target.extend_from_slice(&args.cargo_args);
        args_with_target
    } else if zig_version.is_some() {

Option 2

"--target" is placed before "--" in specific commands

in cross::get_filtered_args:

    // Make sure --target is present
    } else if !args.cargo_args.iter().any(|a| a.starts_with("--target")) {
        let index = if args.subcommand.clone().is_some_and(|s| s.needs_target_before_dash_dash()) {
            args.cargo_args.iter().position(|a| a == "--").unwrap_or(args.cargo_args.len())
        } else {
            args.cargo_args.len()
        };
        let mut args_with_target = args.cargo_args.clone();
        args_with_target.insert(index, "--target".to_owned());
        args_with_target.insert(index + 1, add_libc(target.triple()));
        args_with_target
    } else if zig_version.is_some() {

in cross::cargo::Subcommand:

impl SubCommand {
    /* (...cut...) */

    #[must_use]
    pub fn needs_target_before_dash_dash(self) -> bool {
        matches!(self, Subcommand::Run | Subcommand::Test | Subcommand::Bench)
    }
}