Added suggestion instead of help

rust-lang · Nov 2, 2023 · 81bfab7 · 81bfab7
1 parent 3a7f798
commit 81bfab7
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 18 deletions.
diff --git a/compiler/rustc_privacy/messages.ftl b/compiler/rustc_privacy/messages.ftl
@@ -8,8 +8,7 @@ privacy_from_private_dep_in_public_interface =
 privacy_in_public_interface = {$vis_descr} {$kind} `{$descr}` in public interface
     .label = can't leak {$vis_descr} {$kind}
     .visibility_label = `{$descr}` declared as {$vis_descr}
-    .help = - Either remove the `pub` from the function
-            - Or add `pub` to `{$descr}`
+    .suggestion = consider adding `pub` in front of it
 
 privacy_item_is_private = {$kind} `{$descr}` is private
     .label = private {$kind}

diff --git a/compiler/rustc_privacy/src/errors.rs b/compiler/rustc_privacy/src/errors.rs
@@ -48,7 +48,6 @@ pub struct UnnamedItemIsPrivate {
 }
 
 #[derive(Diagnostic)]
-#[help]
 #[diag(privacy_in_public_interface, code = "E0446")]
 pub struct InPublicInterface<'a> {
     #[primary_span]
@@ -59,6 +58,8 @@ pub struct InPublicInterface<'a> {
     pub descr: DiagnosticArgFromDisplay<'a>,
     #[label(privacy_visibility_label)]
     pub vis_span: Span,
+    #[suggestion(code="", applicability = "maybe-incorrect")]
+    pub suggestion: Span,
 }
 
 #[derive(Diagnostic)]

diff --git a/tests/ui/const-generics/generic_const_exprs/eval-privacy.stderr b/tests/ui/const-generics/generic_const_exprs/eval-privacy.stderr
@@ -5,7 +5,10 @@ LL |     type AssocTy = Const<{ my_const_fn(U) }>;
    |     ^^^^^^^^^^^^ can't leak private type
 ...
 LL | const fn my_const_fn(val: u8) -> u8 {
-   | ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
+   | -----------------------------------
+   | |
+   | `fn(u8) -> u8 {my_const_fn}` declared as private
+   | help: consider adding `pub` in front of it
 
 error: aborting due to previous error
 

diff --git a/tests/ui/privacy/issue-30079.stderr b/tests/ui/privacy/issue-30079.stderr
@@ -15,7 +15,10 @@ error[E0446]: private type `m2::Priv` in public interface
   --> $DIR/issue-30079.rs:17:9
    |
 LL |     struct Priv;
-   |     ----------- `m2::Priv` declared as private
+   |     -----------
+   |     |
+   |     `m2::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 LL |     impl ::std::ops::Deref for ::SemiPriv {
 LL |         type Target = Priv;
    |         ^^^^^^^^^^^ can't leak private type
@@ -24,7 +27,10 @@ error[E0446]: private type `m3::Priv` in public interface
   --> $DIR/issue-30079.rs:34:9
    |
 LL |     struct Priv;
-   |     ----------- `m3::Priv` declared as private
+   |     -----------
+   |     |
+   |     `m3::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 LL |     impl ::SemiPrivTrait for () {
 LL |         type Assoc = Priv;
    |         ^^^^^^^^^^ can't leak private type

diff --git a/tests/ui/privacy/private-in-public-assoc-ty.stderr b/tests/ui/privacy/private-in-public-assoc-ty.stderr
@@ -2,7 +2,10 @@ error[E0446]: private type `Priv` in public interface
   --> $DIR/private-in-public-assoc-ty.rs:17:9
    |
 LL |     struct Priv;
-   |     ----------- `Priv` declared as private
+   |     -----------
+   |     |
+   |     `Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type A = Priv;
    |         ^^^^^^ can't leak private type
@@ -48,7 +51,10 @@ error[E0446]: private type `Priv` in public interface
   --> $DIR/private-in-public-assoc-ty.rs:31:9
    |
 LL |     struct Priv;
-   |     ----------- `Priv` declared as private
+   |     -----------
+   |     |
+   |     `Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Alias4 = Priv;
    |         ^^^^^^^^^^^ can't leak private type
@@ -57,7 +63,10 @@ error[E0446]: private type `Priv` in public interface
   --> $DIR/private-in-public-assoc-ty.rs:38:9
    |
 LL |     struct Priv;
-   |     ----------- `Priv` declared as private
+   |     -----------
+   |     |
+   |     `Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Alias1 = Priv;
    |         ^^^^^^^^^^^ can't leak private type

diff --git a/tests/ui/privacy/private-in-public-warn.stderr b/tests/ui/privacy/private-in-public-warn.stderr
@@ -55,7 +55,10 @@ error[E0446]: private type `types::Priv` in public interface
   --> $DIR/private-in-public-warn.rs:22:9
    |
 LL |     struct Priv;
-   |     ----------- `types::Priv` declared as private
+   |     -----------
+   |     |
+   |     `types::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Alias = Priv;
    |         ^^^^^^^^^^ can't leak private type
@@ -124,7 +127,10 @@ error[E0446]: private type `types::Priv` in public interface
   --> $DIR/private-in-public-warn.rs:32:9
    |
 LL |     struct Priv;
-   |     ----------- `types::Priv` declared as private
+   |     -----------
+   |     |
+   |     `types::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Alias = Priv;
    |         ^^^^^^^^^^ can't leak private type
@@ -306,7 +312,10 @@ error[E0446]: private type `impls::Priv` in public interface
   --> $DIR/private-in-public-warn.rs:109:9
    |
 LL |     struct Priv;
-   |     ----------- `impls::Priv` declared as private
+   |     -----------
+   |     |
+   |     `impls::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Alias = Priv;
    |         ^^^^^^^^^^ can't leak private type
@@ -327,7 +336,10 @@ error[E0446]: private type `aliases_pub::Priv` in public interface
   --> $DIR/private-in-public-warn.rs:183:9
    |
 LL |     struct Priv;
-   |     ----------- `aliases_pub::Priv` declared as private
+   |     -----------
+   |     |
+   |     `aliases_pub::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Check = Priv;
    |         ^^^^^^^^^^ can't leak private type
@@ -336,7 +348,10 @@ error[E0446]: private type `aliases_pub::Priv` in public interface
   --> $DIR/private-in-public-warn.rs:186:9
    |
 LL |     struct Priv;
-   |     ----------- `aliases_pub::Priv` declared as private
+   |     -----------
+   |     |
+   |     `aliases_pub::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Check = Priv;
    |         ^^^^^^^^^^ can't leak private type
@@ -345,7 +360,10 @@ error[E0446]: private type `aliases_pub::Priv` in public interface
   --> $DIR/private-in-public-warn.rs:189:9
    |
 LL |     struct Priv;
-   |     ----------- `aliases_pub::Priv` declared as private
+   |     -----------
+   |     |
+   |     `aliases_pub::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Check = Priv;
    |         ^^^^^^^^^^ can't leak private type
@@ -354,7 +372,10 @@ error[E0446]: private type `aliases_pub::Priv` in public interface
   --> $DIR/private-in-public-warn.rs:192:9
    |
 LL |     struct Priv;
-   |     ----------- `aliases_pub::Priv` declared as private
+   |     -----------
+   |     |
+   |     `aliases_pub::Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Check = Priv;
    |         ^^^^^^^^^^ can't leak private type

diff --git a/tests/ui/privacy/private-inferred-type.stderr b/tests/ui/privacy/private-inferred-type.stderr
@@ -2,7 +2,10 @@ error[E0446]: private type `Priv` in public interface
   --> $DIR/private-inferred-type.rs:61:36
    |
 LL |     struct Priv;
-   |     ----------- `Priv` declared as private
+   |     -----------
+   |     |
+   |     `Priv` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |     impl TraitWithAssocTy for u8 { type AssocTy = Priv; }
    |                                    ^^^^^^^^^^^^ can't leak private type
@@ -11,7 +14,10 @@ error[E0446]: private type `S2` in public interface
   --> $DIR/private-inferred-type.rs:83:9
    |
 LL |     struct S2;
-   |     --------- `S2` declared as private
+   |     ---------
+   |     |
+   |     `S2` declared as private
+   |     help: consider adding `pub` in front of it
 ...
 LL |         type Target = S2Alias;
    |         ^^^^^^^^^^^ can't leak private type