Auto merge of #11961 - ehuss:chdir-beta, r=weihanglo

[beta 1.69] Change -C to be unstable

Beta backport of #11960.

This also includes some other changes to get CI passing:

#11916 — Disable test_profile test on windows-gnu
Ignored some tests due to a change in clap output

src/bin/cargo/cli.rs

@@ -31,6 +31,23 @@ pub fn main(config: &mut LazyConfig) -> CliResult {
     // This must be completed before config is initialized
     assert_eq!(config.is_init(), false);
     if let Some(new_cwd) = args.get_one::<std::path::PathBuf>("directory") {
+        // This is a temporary hack. This cannot access `Config`, so this is a bit messy.
+        // This does not properly parse `-Z` flags that appear after the subcommand.
+        // The error message is not as helpful as the standard one.
+        let nightly_features_allowed = matches!(&*features::channel(), "nightly" | "dev");
+        if !nightly_features_allowed
+            || (nightly_features_allowed
+                && !args
+                    .get_many("unstable-features")
+                    .map(|mut z| z.any(|value: &String| value == "unstable-options"))
+                    .unwrap_or(false))
+        {
+            return Err(anyhow::format_err!(
+                "the `-C` flag is unstable, \
+                 pass `-Z unstable-options` on the nightly channel to enable it"
+            )
+            .into());
+        }
         std::env::set_current_dir(&new_cwd).context("could not change to requested directory")?;
     }
 
@@ -476,7 +493,7 @@ See 'cargo help <command>' for more information on a specific command.\n",
         )
         .arg(
             Arg::new("directory")
-                .help("Change to DIRECTORY before doing anything")
+                .help("Change to DIRECTORY before doing anything (nightly-only)")
                 .short('C')
                 .value_name("DIRECTORY")
                 .value_hint(clap::ValueHint::DirPath)

src/doc/man/generated_txt/cargo-add.txt

@@ -192,6 +192,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-bench.txt

@@ -371,6 +371,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-build.txt

@@ -320,6 +320,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-check.txt

@@ -305,6 +305,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-clean.txt

@@ -134,6 +134,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-doc.txt

@@ -276,6 +276,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-fetch.txt

@@ -119,6 +119,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-fix.txt

@@ -378,6 +378,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-generate-lockfile.txt

@@ -94,6 +94,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-init.txt

@@ -102,6 +102,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-install.txt

@@ -352,6 +352,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-locate-project.txt

@@ -85,6 +85,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-login.txt

@@ -77,6 +77,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-metadata.txt

@@ -407,6 +407,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-new.txt

@@ -97,6 +97,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-owner.txt

@@ -104,6 +104,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-package.txt

@@ -246,6 +246,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-pkgid.txt

@@ -124,6 +124,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-publish.txt

@@ -212,6 +212,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-remove.txt

@@ -110,6 +110,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-run.txt

@@ -220,6 +220,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-rustc.txt

@@ -322,6 +322,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-rustdoc.txt

@@ -292,6 +292,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-search.txt

@@ -74,6 +74,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-test.txt

@@ -389,6 +389,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-tree.txt

@@ -305,6 +305,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-uninstall.txt

@@ -86,6 +86,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-update.txt

@@ -124,6 +124,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-vendor.txt

@@ -120,6 +120,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.
 

src/doc/man/generated_txt/cargo-verify-project.txt

@@ -97,6 +97,11 @@ OPTIONS
            for the project manifest (Cargo.toml), as well as the directories
            searched for discovering .cargo/config.toml, for example.
 
+           This option is only available on the nightly channel
+           <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and
+           requires the -Z unstable-options flag to enable (see #10098
+           <https://github.com/rust-lang/cargo/issues/10098>).
+
        -h, --help
            Prints help information.