feat: Stabilize build.warnings

This allows users to either
- hide warnings (#14258)
- error on warnings (#8424)

`build.warnings` is setup to mirror the behavior of `RUSTFLAGS=-Dwarnings`,
including
- only errors for lint warnings and not hard warnings
- only errors for local warnings and not non-local warnings visible with
  `--verbose --verbose`
- stop the build without `--keep-going`

These conditions were not originally met and also came as feedback from
rust-lang/rust which has been dogfooding this since the merge of rust-lang/rust#148332.

Things are a bit different with `RUSTFLAGS=-Awarnings`:
- Hard warnings are hidden for rustc but not cargo (rustc seems in the
  wrong imo)
  - In particular, we shouldn't mask the edition warning for Cargo
    Script
- both hide the warning summary line (number of warnings per crate)
- both hide non-local warnings for `--verbose --verbose`

One design constraint we are operating on with this is that changing
`build.warnings` should not cause a rebuild, unlike a `RUSTFLAGS`
solution.

Closes #14802

Author: epage

src/cargo/core/features.rs

@@ -914,7 +914,6 @@ unstable_cli_options!(
     target_applies_to_host: bool = ("Enable the `target-applies-to-host` key in the .cargo/config.toml file"),
     trim_paths: bool = ("Enable the `trim-paths` option in profiles"),
     unstable_options: bool = ("Allow the usage of unstable options"),
-    warnings: bool = ("Allow use of the build.warnings config key"),
 );
 
 const STABILIZED_COMPILE_PROGRESS: &str = "The progress bar is now always \
@@ -1001,6 +1000,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_WARNINGS: &str = "The `build.warnings` config key is now always available";
+
 fn deserialize_comma_separated_list<'de, D>(
     deserializer: D,
 ) -> Result<Option<Vec<String>>, D::Error>
@@ -1389,6 +1390,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),
+            "warnings" => stabilized_warn(k, "1.96", STABILIZED_WARNINGS),
 
             // Unstable features
             // Sorted alphabetically:
@@ -1456,7 +1458,6 @@ impl CliUnstable {
             "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)?,
-            "warnings" => self.warnings = parse_empty(k, v)?,
             _ => bail!(
                 "\
             unknown `-Z` flag specified: {k}\n\n\

src/cargo/util/context/mod.rs

@@ -2114,11 +2114,7 @@ impl GlobalContext {
 
     /// Get the global [`WarningHandling`] configuration.
     pub fn warning_handling(&self) -> CargoResult<WarningHandling> {
-        if self.unstable_flags.warnings {
-            Ok(self.build_config()?.warnings.unwrap_or_default())
-        } else {
-            Ok(WarningHandling::default())
-        }
+        Ok(self.build_config()?.warnings.unwrap_or_default())
     }
 
     pub fn ws_roots(&self) -> MutexGuard<'_, HashMap<PathBuf, WorkspaceRootConfig>> {

src/doc/src/reference/config.md

@@ -64,6 +64,7 @@ recursive_example = "rr --example recursions"
 space_example = ["run", "--release", "--", "\"command list\""]
 
 [build]
+warnings = "warn"             # adjust the effective lint level for warnings
 jobs = 1                      # number of parallel jobs, defaults to # of CPUs
 rustc = "rustc"               # the rust compiler tool
 rustc-wrapper = "…"           # run this wrapper instead of `rustc`
@@ -457,6 +458,20 @@ recursive_example = "rr --example recursions"
 
 The `[build]` table controls build-time operations and compiler settings.
 
+### `build.warnings`
+* Type: string
+* Default: `warn`
+* Environment: `CARGO_BUILD_WARNINGS`
+
+Adjust the effective lint level for warnings.
+Allowed values are:
+* `warn`: continue to emit the lints as warnings (default).
+* `allow`: hide the lints.
+* `deny`: emit an error for a crate that has warnings. Use `--keep-going` to see see the warnings for all crates.
+
+Only warnings within the user's control to resolve or adjust the level of are affected,
+e.g. leaving as-is non-lint warnings or warnings from dependencies visible through `--verbose --verbose`.
+
 #### `build.jobs`
 * Type: integer or string
 * Default: number of logical CPUs

src/doc/src/reference/unstable.md

@@ -132,7 +132,6 @@ Each new feature described below should explain how to use it.
     * [script](#script) --- Enable support for single-file `.rs` packages.
     * [lockfile-path](#lockfile-path) --- Allows to specify a path to lockfile other than the default path `<workspace_root>/Cargo.lock`.
     * [native-completions](#native-completions) --- Move cargo shell completions to native completions.
-    * [warnings](#warnings) --- controls warning behavior; options for allowing or denying warnings.
     * [Package message format](#package-message-format) --- Message format for `cargo package`.
     * [`fix-edition`](#fix-edition) --- A permanently unstable edition migration helper.
     * [Plumbing subcommands](https://github.com/crate-ci/cargo-plumbing) --- Low, level commands that act as APIs for Cargo, like `cargo metadata`
@@ -1839,28 +1838,6 @@ When in doubt, you can discuss this in [#14520](https://github.com/rust-lang/car
 - powershell:
   Add `CARGO_COMPLETE=powershell cargo +nightly | Invoke-Expression` to `$PROFILE`.
 
-## warnings
-
-* Original Issue: [#8424](https://github.com/rust-lang/cargo/issues/8424)
-* Tracking Issue: [#14802](https://github.com/rust-lang/cargo/issues/14802)
-
-The `-Z warnings` feature enables the `build.warnings` configuration option to control how
-Cargo handles warnings. If the `-Z warnings` unstable flag is not enabled, then
-the `build.warnings` config will be ignored.
-
-This setting currently only applies to rustc warnings. It may apply to additional warnings (such as Cargo lints or Cargo warnings)
-in the future.
-
-### `build.warnings`
-* Type: string
-* Default: `warn`
-* Environment: `CARGO_BUILD_WARNINGS`
-
-Controls how Cargo handles warnings. Allowed values are:
-* `warn`: warnings are emitted as warnings (default).
-* `allow`: warnings are hidden.
-* `deny`: if warnings are emitted, an error will be raised at the end of the current crate and the process. Use `--keep-going` to see all warnings.
-
 ## feature unification
 
 * RFC: [#3692](https://github.com/rust-lang/rfcs/blob/master/text/3692-feature-unification.md)
@@ -2348,3 +2325,7 @@ See the [`include` config documentation](config.md#include) for more.
 ## pubtime
 
 The `pubtime` index field  has been stabilized in Rust 1.94.0.
+
+## warnings
+
+The `build.warnings` config field has been stabilized in Rust 1.96.

tests/testsuite/cargo/z_help/stdout.term.svg

@@ -22,24 +22,6 @@ fn make_project_with_rustc_warning() -> Project {
         .build()
 }
 
-#[cargo_test]
-fn requires_nightly() {
-    // build.warnings has no effect without -Zwarnings.
-    let p = make_project_with_rustc_warning();
-    p.cargo("check")
-        .arg("--config")
-        .arg("build.warnings='deny'")
-        .with_stderr_data(str![[r#"
-[CHECKING] foo v0.0.1 ([ROOT]/foo)
-[WARNING] unused variable: `x`
-...
-[WARNING] `foo` (bin "foo") generated 1 warning[..]
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
-
-"#]])
-        .run();
-}
-
 #[cargo_test]
 fn clippy() {
     let p = project()
@@ -56,8 +38,6 @@ fn clippy() {
         .build();
 
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='deny'")
         .env("RUSTC_WORKSPACE_WRAPPER", tools::wrapped_clippy_driver())
@@ -77,8 +57,6 @@ fn clippy() {
 fn config() {
     let p = make_project_with_rustc_warning();
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .env("CARGO_BUILD_WARNINGS", "deny")
         .with_stderr_data(str![[r#"
 [CHECKING] foo v0.0.1 ([ROOT]/foo)
@@ -93,8 +71,6 @@ fn config() {
 
     // CLI has precedence over env
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='warn'")
         .env("CARGO_BUILD_WARNINGS", "deny")
@@ -112,8 +88,6 @@ fn config() {
 fn unknown_value() {
     let p = make_project_with_rustc_warning();
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='forbid'")
         .with_stderr_data(str![[r#"
@@ -146,8 +120,6 @@ fn keep_going() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='deny'")
         .with_stderr_data(str![[r#"
@@ -164,8 +136,6 @@ fn keep_going() {
     assert!(!p.bin("foo").is_file());
 
     p.cargo("build --keep-going")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='deny'")
         .with_stderr_data(str![[r#"
@@ -189,8 +159,6 @@ fn keep_going() {
 fn rustc_caching_allow_first() {
     let p = make_project_with_rustc_warning();
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='allow'")
         .with_stderr_data(str![[r#"
@@ -201,8 +169,6 @@ fn rustc_caching_allow_first() {
         .run();
 
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='deny'")
         .with_stderr_data(str![[r#"
@@ -220,8 +186,6 @@ fn rustc_caching_allow_first() {
 fn rustc_caching_deny_first() {
     let p = make_project_with_rustc_warning();
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='deny'")
         .with_stderr_data(str![[r#"
@@ -236,8 +200,6 @@ fn rustc_caching_deny_first() {
         .run();
 
     p.cargo("check")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='allow'")
         .with_stderr_data(str![[r#"
@@ -300,8 +262,6 @@ fn hard_warning_deny() {
 
     // Behavior under test
     p.cargo("rustc")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='deny'")
         .arg("--")
@@ -370,8 +330,6 @@ fn hard_warning_allow() {
 
     // Behavior under test
     p.cargo("rustc")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='allow'")
         .arg("--")
@@ -446,8 +404,6 @@ fn cap_lints_deny() {
 
     // Behavior under test
     p.cargo("check -vv")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='deny'")
         .with_stderr_data(str![[r#"
@@ -520,8 +476,6 @@ fn cap_lints_allow() {
 
     // Behavior under test
     p.cargo("check -vv")
-        .masquerade_as_nightly_cargo(&["warnings"])
-        .arg("-Zwarnings")
         .arg("--config")
         .arg("build.warnings='allow'")
         .with_stderr_data(str![[r#"