Improve error messages

GuillaumeGomez · GuillaumeGomez · commit 20724ef44954 · 2022-10-10T16:49:53.000+02:00
diff --git a/compiler/rustc_error_messages/locales/en-US/passes.ftl b/compiler/rustc_error_messages/locales/en-US/passes.ftl
@@ -77,7 +77,7 @@ passes_doc_alias_malformed =
 
 passes_doc_auto_cfg_malformed = `#![doc({$attr_str})]` attribute doesn't expect a value
 
-passes_doc_both_auto_cfg = please don't specify both `doc(auto_cfg)` and `doc(no_auto_cfg)`
+passes_doc_both_auto_cfg = conflicting attributes `doc(auto_cfg)` and `doc(no_auto_cfg)`
     .label = the other is specified here
 
 passes_doc_no_auto_cfg_enabled_by_default = `doc(no_auto_cfg)` is enabled by default before the 2024 edition
diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
@@ -168,8 +168,8 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
                     .sess()
                     .diagnostic()
                     .struct_warn(
-                        "the `doc_auto_cfg` feature is used but `#![doc(auto_cfg)]` isn't so it \
-                         won't do anything",
+                        "feature `doc_auto_cfg` now requires attribute `#![doc(auto_cfg)]` to \
+                         enable the behavior",
                     )
                     .emit();
             }
diff --git a/src/test/rustdoc-ui/doc_auto_cfg.stderr b/src/test/rustdoc-ui/doc_auto_cfg.stderr
@@ -1,4 +1,4 @@
-warning: the `doc_auto_cfg` feature is used but `#![doc(auto_cfg)]` isn't so it won't do anything
+warning: feature `doc_auto_cfg` now requires attribute `#![doc(auto_cfg)]` to enable the behavior
 
 warning: 1 warning emitted
 
diff --git a/src/test/rustdoc-ui/doc_no_auto_cfg.stderr b/src/test/rustdoc-ui/doc_no_auto_cfg.stderr
@@ -46,7 +46,7 @@ error: `doc(no_auto_cfg)` is enabled by default before the 2024 edition
 LL | #![doc(auto_cfg, no_auto_cfg)]
    |                  ^^^^^^^^^^^
 
-error: please don't specify both `doc(auto_cfg)` and `doc(no_auto_cfg)`
+error: conflicting attributes `doc(auto_cfg)` and `doc(no_auto_cfg)`
   --> $DIR/doc_no_auto_cfg.rs:3:8
    |
 LL | #![doc(no_auto_cfg)]

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,8 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {`
`168`	`168`	`.sess()`
`169`	`169`	`.diagnostic()`
`170`	`170`	`.struct_warn(`
`171`		- "the `doc_auto_cfg` feature is used but `#![doc(auto_cfg)]` isn't so it \
`172`		`- won't do anything",`
	`171`	+ "feature `doc_auto_cfg` now requires attribute `#![doc(auto_cfg)]` to \
	`172`	`+ enable the behavior",`
`173`	`173`	`)`
`174`	`174`	`.emit();`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-warning: the `doc_auto_cfg` feature is used but `#![doc(auto_cfg)]` isn't so it won't do anything
	`1`	+warning: feature `doc_auto_cfg` now requires attribute `#![doc(auto_cfg)]` to enable the behavior
`2`	`2`
`3`	`3`	`warning: 1 warning emitted`
`4`	`4`
Original file line number	Diff line number	Diff line change
@@ -46,7 +46,7 @@ error: `doc(no_auto_cfg)` is enabled by default before the 2024 edition
`46`	`46`	`LL \| #![doc(auto_cfg, no_auto_cfg)]`
`47`	`47`	`\| ^^^^^^^^^^^`
`48`	`48`
`49`		-error: please don't specify both `doc(auto_cfg)` and `doc(no_auto_cfg)`
	`49`	+error: conflicting attributes `doc(auto_cfg)` and `doc(no_auto_cfg)`
`50`	`50`	`--> $DIR/doc_no_auto_cfg.rs:3:8`
`51`	`51`	`\|`
`52`	`52`	`LL \| #![doc(no_auto_cfg)]`