Stabilize cargo script

src/bin/cargo/cli.rs

@@ -337,23 +337,7 @@ To pass the arguments to the subcommand, remove `--`",
                     }
                 }
                 if commands::run::is_manifest_command(cmd) {
-                    if gctx.cli_unstable().script {
-                        return Ok((args, GlobalArgs::default()));
-                    } else {
-                        gctx.shell().print_report(
-                            &[
-                                Level::WARNING.secondary_title(
-                                    format!("user-defined alias `{cmd}` has the appearance of a manifest-command")
-                                ).element(
-                                    Level::NOTE.message(
-                                        "this was previously accepted but will be phased out when `-Zscript` is stabilized; \
-                                        see <https://github.com/rust-lang/cargo/issues/12207>"
-                                    )
-                                )
-                            ],
-                            false
-                        )?;
-                    }
+                    return Ok((args, GlobalArgs::default()));
                 }
 
                 let mut alias = alias
@@ -490,31 +474,12 @@ impl Exec {
         match self {
             Self::Builtin(exec) => exec(gctx, subcommand_args),
             Self::Manifest(cmd) => {
-                let ext_path = super::find_external_subcommand(gctx, &cmd);
-                if !gctx.cli_unstable().script && ext_path.is_some() {
-                    gctx.shell().print_report(
-                        &[
-                            Level::WARNING.secondary_title(
-                                format!("external subcommand `{cmd}` has the appearance of a manifest-command")
-                            ).element(
-                                Level::NOTE.message(
-                                    "this was previously accepted but will be phased out when `-Zscript` is stabilized; \
-                                    see <https://github.com/rust-lang/cargo/issues/12207>"
-                                )
-                            )
-                        ],
-                        false
-                    )?;
-
-                    Self::External(cmd).exec(gctx, subcommand_args)
-                } else {
-                    let ext_args: Vec<OsString> = subcommand_args
-                        .get_many::<OsString>("")
-                        .unwrap_or_default()
-                        .cloned()
-                        .collect();
-                    commands::run::exec_manifest_command(gctx, &cmd, &ext_args)
-                }
+                let ext_args: Vec<OsString> = subcommand_args
+                    .get_many::<OsString>("")
+                    .unwrap_or_default()
+                    .cloned()
+                    .collect();
+                commands::run::exec_manifest_command(gctx, &cmd, &ext_args)
             }
             Self::External(cmd) => {
                 let mut ext_args = vec![OsStr::new(&cmd)];
@@ -581,11 +546,11 @@ pub fn cli(gctx: &GlobalContext) -> Command {
 
     let usage = if is_rustup() {
         color_print::cstr!(
-            "<bright-cyan,bold>cargo</> <cyan>[+toolchain] [OPTIONS] [COMMAND]</>\n       <bright-cyan,bold>cargo</> <cyan>[+toolchain] [OPTIONS]</> <bright-cyan,bold>-Zscript</> <cyan><<MANIFEST_RS>> [ARGS]...</>"
+            "<bright-cyan,bold>cargo</> <cyan>[+toolchain] [OPTIONS] [COMMAND]</>\n       <bright-cyan,bold>cargo</> <cyan>[+toolchain] [OPTIONS]</> <cyan><<MANIFEST_RS>> [ARGS]...</>"
         )
     } else {
         color_print::cstr!(
-            "<bright-cyan,bold>cargo</> <cyan>[OPTIONS] [COMMAND]</>\n       <bright-cyan,bold>cargo</> <cyan>[OPTIONS]</> <bright-cyan,bold>-Zscript</> <cyan><<MANIFEST_RS>> [ARGS]...</>"
+            "<bright-cyan,bold>cargo</> <cyan>[OPTIONS] [COMMAND]</>\n       <bright-cyan,bold>cargo</> <cyan>[OPTIONS]</> <cyan><<MANIFEST_RS>> [ARGS]...</>"
         )
     };
 

src/bin/cargo/commands/run.rs

@@ -96,84 +96,42 @@ pub fn is_manifest_command(arg: &str) -> bool {
 
 pub fn exec_manifest_command(gctx: &mut GlobalContext, cmd: &str, args: &[OsString]) -> CliResult {
     let manifest_path = Path::new(cmd);
-    match (manifest_path.is_file(), gctx.cli_unstable().script) {
-        (true, true) => {}
-        (true, false) => {
-            return Err(anyhow::anyhow!("running the file `{cmd}` requires `-Zscript`").into());
-        }
-        (false, true) => {
-            let possible_commands = crate::list_commands(gctx);
-            let is_dir = if manifest_path.is_dir() {
-                format!(": `{cmd}` is a directory")
-            } else {
-                "".to_owned()
-            };
-            let suggested_command = if let Some(suggested_command) = possible_commands
-                .keys()
-                .filter(|c| cmd.starts_with(c.as_str()))
-                .max_by_key(|c| c.len())
-            {
-                let actual_args = cmd.strip_prefix(suggested_command).unwrap();
-                let args = if args.is_empty() {
-                    "".to_owned()
-                } else {
-                    format!(
-                        " {}",
-                        args.into_iter().map(|os| os.to_string_lossy()).join(" ")
-                    )
-                };
-                format!(
-                    "\nhelp: there is a command with a similar name: `{suggested_command} {actual_args}{args}`"
-                )
-            } else {
+    if !manifest_path.is_file() {
+        let possible_commands = crate::list_commands(gctx);
+        let is_dir = if manifest_path.is_dir() {
+            format!(": `{cmd}` is a directory")
+        } else {
+            "".to_owned()
+        };
+        let suggested_command = if let Some(suggested_command) = possible_commands
+            .keys()
+            .filter(|c| cmd.starts_with(c.as_str()))
+            .max_by_key(|c| c.len())
+        {
+            let actual_args = cmd.strip_prefix(suggested_command).unwrap();
+            let args = if args.is_empty() {
                 "".to_owned()
-            };
-            let suggested_script = if let Some(suggested_script) = suggested_script(cmd) {
-                format!("\nhelp: there is a script with a similar name: `{suggested_script}`")
             } else {
-                "".to_owned()
-            };
-            return Err(anyhow::anyhow!(
-                "no such file or subcommand `{cmd}`{is_dir}{suggested_command}{suggested_script}"
-            )
-            .into());
-        }
-        (false, false) => {
-            // HACK: duplicating the above for minor tweaks but this will all go away on
-            // stabilization
-            let possible_commands = crate::list_commands(gctx);
-            let suggested_command = if let Some(suggested_command) = possible_commands
-                .keys()
-                .filter(|c| cmd.starts_with(c.as_str()))
-                .max_by_key(|c| c.len())
-            {
-                let actual_args = cmd.strip_prefix(suggested_command).unwrap();
-                let args = if args.is_empty() {
-                    "".to_owned()
-                } else {
-                    format!(
-                        " {}",
-                        args.into_iter().map(|os| os.to_string_lossy()).join(" ")
-                    )
-                };
                 format!(
-                    "\nhelp: there is a command with a similar name: `{suggested_command} {actual_args}{args}`"
+                    " {}",
+                    args.into_iter().map(|os| os.to_string_lossy()).join(" ")
                 )
-            } else {
-                "".to_owned()
-            };
-            let suggested_script = if let Some(suggested_script) = suggested_script(cmd) {
-                format!(
-                    "\nhelp: there is a script with a similar name: `{suggested_script}` (requires `-Zscript`)"
-                )
-            } else {
-                "".to_owned()
             };
-            return Err(anyhow::anyhow!(
-                "no such subcommand `{cmd}`{suggested_command}{suggested_script}"
+            format!(
+                "\nhelp: there is a command with a similar name: `{suggested_command} {actual_args}{args}`"
             )
-            .into());
-        }
+        } else {
+            "".to_owned()
+        };
+        let suggested_script = if let Some(suggested_script) = suggested_script(cmd) {
+            format!("\nhelp: there is a script with a similar name: `{suggested_script}`")
+        } else {
+            "".to_owned()
+        };
+        return Err(anyhow::anyhow!(
+            "no such file or subcommand `{cmd}`{is_dir}{suggested_command}{suggested_script}"
+        )
+        .into());
     }
 
     let manifest_path = root_manifest(Some(manifest_path), gctx)?;

src/bin/cargo/main.rs

@@ -276,9 +276,7 @@ fn execute_external_subcommand(gctx: &GlobalContext, cmd: &str, args: &[&OsStr])
     let command = match path {
         Some(command) => command,
         None => {
-            let script_suggestion = if gctx.cli_unstable().script
-                && std::path::Path::new(cmd).is_file()
-            {
+            let script_suggestion = if std::path::Path::new(cmd).is_file() {
                 let sep = std::path::MAIN_SEPARATOR;
                 format!(
                     "\nhelp: To run the file `{cmd}`, provide a relative path like `.{sep}{cmd}`"

src/cargo/core/compiler/mod.rs

@@ -794,13 +794,8 @@ fn prepare_rustc(build_runner: &BuildRunner<'_, '_>, unit: &Unit) -> CargoResult
         .compilation
         .rustc_process(unit, is_primary, is_workspace)?;
     build_base_args(build_runner, &mut base, unit)?;
+    // TODO: remove once frontmatter hits nightly
     if unit.pkg.manifest().is_embedded() {
-        if !gctx.cli_unstable().script {
-            anyhow::bail!(
-                "parsing `{}` requires `-Zscript`",
-                unit.pkg.manifest_path().display()
-            );
-        }
         base.arg("-Z").arg("crate-attr=feature(frontmatter)");
     }
 
@@ -849,13 +844,8 @@ fn prepare_rustdoc(build_runner: &BuildRunner<'_, '_>, unit: &Unit) -> CargoResu
     let bcx = build_runner.bcx;
     // script_metadata is not needed here, it is only for tests.
     let mut rustdoc = build_runner.compilation.rustdoc_process(unit, None)?;
+    // TODO: remove once frontmatter hits nightly
     if unit.pkg.manifest().is_embedded() {
-        if !bcx.gctx.cli_unstable().script {
-            anyhow::bail!(
-                "parsing `{}` requires `-Zscript`",
-                unit.pkg.manifest_path().display()
-            );
-        }
         rustdoc.arg("-Z").arg("crate-attr=feature(frontmatter)");
     }
     rustdoc.inherit_jobserver(&build_runner.jobserver);

src/cargo/core/features.rs

@@ -891,7 +891,6 @@ unstable_cli_options!(
     rustdoc_mergeable_info: bool = ("Use rustdoc mergeable cross-crate-info files"),
     rustdoc_scrape_examples: bool = ("Allows Rustdoc to scrape code examples from reverse-dependencies"),
     sbom: bool = ("Enable the `sbom` option in build config in .cargo/config.toml file"),
-    script: bool = ("Enable support for single-file, `.rs` packages"),
     section_timings: bool = ("Enable support for extended compilation sections in --timings output"),
     separate_nightlies: bool,
     skip_rustdoc_fingerprint: bool,
@@ -985,6 +984,8 @@ const STABILIZED_BUILD_DIR: &str = "build.build-dir is now always enabled.";
 
 const STABILIZED_CONFIG_INCLUDE: &str = "The `include` config key is now always available";
 
+const STABILIZED_SCRIPT: &str = "Cargo scripts are now always available";
+
 fn deserialize_comma_separated_list<'de, D>(
     deserializer: D,
 ) -> Result<Option<Vec<String>>, D::Error>
@@ -1373,6 +1374,7 @@ impl CliUnstable {
             "package-workspace" => stabilized_warn(k, "1.89", STABILIZED_PACKAGE_WORKSPACE),
             "build-dir" => stabilized_warn(k, "1.91", STABILIZED_BUILD_DIR),
             "config-include" => stabilized_warn(k, "1.93", STABILIZED_CONFIG_INCLUDE),
+            "script" => stabilized_warn(k, "1.95", STABILIZED_SCRIPT),
 
             // Unstable features
             // Sorted alphabetically:
@@ -1436,7 +1438,6 @@ impl CliUnstable {
             "separate-nightlies" => self.separate_nightlies = parse_empty(k, v)?,
             "checksum-freshness" => self.checksum_freshness = parse_empty(k, v)?,
             "skip-rustdoc-fingerprint" => self.skip_rustdoc_fingerprint = parse_empty(k, v)?,
-            "script" => self.script = parse_empty(k, v)?,
             "target-applies-to-host" => self.target_applies_to_host = parse_empty(k, v)?,
             "panic-immediate-abort" => self.panic_immediate_abort = parse_empty(k, v)?,
             "unstable-options" => self.unstable_options = parse_empty(k, v)?,

src/cargo/util/command_prelude.rs

@@ -1097,9 +1097,6 @@ pub fn root_manifest(manifest_path: Option<&Path>, gctx: &GlobalContext) -> Carg
                 manifest_path.display()
             )
         }
-        if crate::util::toml::is_embedded(&path) && !gctx.cli_unstable().script {
-            anyhow::bail!("embedded manifest `{}` requires `-Zscript`", path.display())
-        }
         Ok(path)
     } else {
         find_root_manifest_for_wd(gctx.cwd())

src/cargo/util/toml/mod.rs

@@ -158,9 +158,6 @@ pub fn read_manifest(
 fn read_toml_string(path: &Path, is_embedded: bool, gctx: &GlobalContext) -> CargoResult<String> {
     let mut contents = paths::read(path).map_err(|err| ManifestError::new(err, path.into()))?;
     if is_embedded {
-        if !gctx.cli_unstable().script {
-            anyhow::bail!("parsing `{}` requires `-Zscript`", path.display());
-        }
         contents = embedded::expand_manifest(&contents)
             .map_err(|e| emit_frontmatter_diagnostic(e, &contents, path, gctx))?;
     }

src/doc/man/cargo.md

@@ -7,6 +7,7 @@ cargo --- The Rust package manager
 ## SYNOPSIS
 
 `cargo` [_options_] _command_ [_args_]\
+`cargo` [_options_] _script_ [_args_]\
 `cargo` [_options_] `--version`\
 `cargo` [_options_] `--list`\
 `cargo` [_options_] `--help`\
@@ -232,7 +233,11 @@ stable yet and may be subject to change.
        mkdir foo && cd foo
        cargo init .
 
-6. Learn about a command's options and usage:
+6. Run a script
+
+       cargo task.rs --action
+
+7. Learn about a command's options and usage:
 
        cargo help clean
 

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

@@ -164,8 +164,9 @@ OPTIONS
 
    Manifest Options
        --manifest-path path
-           Path to the Cargo.toml file. By default, Cargo searches for the
-           Cargo.toml file in the current directory or any parent directory.
+           Path to the Cargo.toml or cargo script file. By default, Cargo
+           searches for the Cargo.toml file in the current directory or any
+           parent directory.
 
        -p spec, --package spec
            Add dependencies to only the specified package.

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

@@ -335,8 +335,9 @@ OPTIONS
 
    Manifest Options
        --manifest-path path
-           Path to the Cargo.toml file. By default, Cargo searches for the
-           Cargo.toml file in the current directory or any parent directory.
+           Path to the Cargo.toml or cargo script file. By default, Cargo
+           searches for the Cargo.toml file in the current directory or any
+           parent directory.
 
        --ignore-rust-version
            Ignore rust-version specification in packages.

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

@@ -259,8 +259,9 @@ OPTIONS
 
    Manifest Options
        --manifest-path path
-           Path to the Cargo.toml file. By default, Cargo searches for the
-           Cargo.toml file in the current directory or any parent directory.
+           Path to the Cargo.toml or cargo script file. By default, Cargo
+           searches for the Cargo.toml file in the current directory or any
+           parent directory.
 
        --ignore-rust-version
            Ignore rust-version specification in packages.

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

@@ -253,8 +253,9 @@ OPTIONS
 
    Manifest Options
        --manifest-path path
-           Path to the Cargo.toml file. By default, Cargo searches for the
-           Cargo.toml file in the current directory or any parent directory.
+           Path to the Cargo.toml or cargo script file. By default, Cargo
+           searches for the Cargo.toml file in the current directory or any
+           parent directory.
 
        --ignore-rust-version
            Ignore rust-version specification in packages.

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

@@ -104,8 +104,9 @@ OPTIONS
 
    Manifest Options
        --manifest-path path
-           Path to the Cargo.toml file. By default, Cargo searches for the
-           Cargo.toml file in the current directory or any parent directory.
+           Path to the Cargo.toml or cargo script file. By default, Cargo
+           searches for the Cargo.toml file in the current directory or any
+           parent directory.
 
        --locked
            Asserts that the exact same dependencies and versions are used as

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

@@ -228,8 +228,9 @@ OPTIONS
 
    Manifest Options
        --manifest-path path
-           Path to the Cargo.toml file. By default, Cargo searches for the
-           Cargo.toml file in the current directory or any parent directory.
+           Path to the Cargo.toml or cargo script file. By default, Cargo
+           searches for the Cargo.toml file in the current directory or any
+           parent directory.
 
        --ignore-rust-version
            Ignore rust-version specification in packages.

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

@@ -81,8 +81,9 @@ OPTIONS
 
    Manifest Options
        --manifest-path path
-           Path to the Cargo.toml file. By default, Cargo searches for the
-           Cargo.toml file in the current directory or any parent directory.
+           Path to the Cargo.toml or cargo script file. By default, Cargo
+           searches for the Cargo.toml file in the current directory or any
+           parent directory.
 
        --locked
            Asserts that the exact same dependencies and versions are used as