Skip to content

Commit 1accf06

Browse files
borsbors
committed
Auto merge of #113126 - Bryanskiy:delete_old, r=petrochenkov
Replace old private-in-public diagnostic with type privacy lints Next part of RFC #48054. r? `@petrochenkov`
2 parents f4555ef + e26614e commit 1accf06

File tree

68 files changed

+850
-1688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+850
-1688
lines changed

‎compiler/rustc_error_codes/src/error_codes.rs

+1
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,7 @@ E0794: include_str!("./error_codes/E0794.md"),
608608
// E0420, // merged into 532
609609
// E0421, // merged into 531
610610
// E0427, // merged into 530
611+
// E0445, // merged into 446 and type privacy lints
611612
// E0456, // plugin `..` is not available for triple `..`
612613
// E0465, // removed: merged with E0464
613614
// E0467, // removed

‎compiler/rustc_error_codes/src/error_codes/E0445.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
A private trait was used on a public type parameter bound.
1+
#### Note: this error code is no longer emitted by the compiler.
22

3-
Erroneous code examples:
3+
A private trait was used on a public type parameter bound.
44

5-
```compile_fail,E0445
6-
#![deny(private_in_public)]
5+
Previously erroneous code examples:
76

7+
```
88
trait Foo {
99
fn dummy(&self) { }
1010
}

‎compiler/rustc_error_codes/src/error_codes/E0446.md

+25-21
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
A private type was used in a public type signature.
1+
A private type or trait was used in a public associated type signature.
22

33
Erroneous code example:
44

55
```compile_fail,E0446
6-
#![deny(private_in_public)]
7-
struct Bar(u32);
8-
9-
mod foo {
10-
use crate::Bar;
11-
pub fn bar() -> Bar { // error: private type in public interface
12-
Bar(0)
13-
}
6+
struct Bar;
7+
8+
pub trait PubTr {
9+
type Alias;
10+
}
11+
12+
impl PubTr for u8 {
13+
type Alias = Bar; // error private type in public interface
1414
}
1515
1616
fn main() {}
@@ -22,13 +22,14 @@ This is done by using pub(crate) or pub(in crate::my_mod::etc)
2222
Example:
2323

2424
```
25-
struct Bar(u32);
25+
struct Bar;
26+
27+
pub(crate) trait PubTr { // only public to crate root
28+
type Alias;
29+
}
2630
27-
mod foo {
28-
use crate::Bar;
29-
pub(crate) fn bar() -> Bar { // only public to crate root
30-
Bar(0)
31-
}
31+
impl PubTr for u8 {
32+
type Alias = Bar;
3233
}
3334
3435
fn main() {}
@@ -38,12 +39,15 @@ The other way to solve this error is to make the private type public.
3839
Example:
3940

4041
```
41-
pub struct Bar(u32); // we set the Bar type public
42-
mod foo {
43-
use crate::Bar;
44-
pub fn bar() -> Bar { // ok!
45-
Bar(0)
46-
}
42+
43+
pub struct Bar; // we set the Bar trait public
44+
45+
pub trait PubTr {
46+
type Alias;
47+
}
48+
49+
impl PubTr for u8 {
50+
type Alias = Bar;
4751
}
4852
4953
fn main() {}

‎compiler/rustc_lint/src/lib.rs

+5
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,11 @@ fn register_builtins(store: &mut LintStore) {
500500
"converted into hard error, see issue #82523 \
501501
<https://github.com/rust-lang/rust/issues/82523> for more information",
502502
);
503+
store.register_removed(
504+
"private_in_public",
505+
"replaced with another group of lints, see RFC \
506+
<https://rust-lang.github.io/rfcs/2145-type-privacy.html> for more information",
507+
);
503508
}
504509

505510
fn register_internals(store: &mut LintStore) {

‎compiler/rustc_lint_defs/src/builtin.rs

+2-47
Original file line numberDiff line numberDiff line change
@@ -982,44 +982,6 @@ declare_lint! {
982982
"detects trivial casts of numeric types which could be removed"
983983
}
984984

985-
declare_lint! {
986-
/// The `private_in_public` lint detects private items in public
987-
/// interfaces not caught by the old implementation.
988-
///
989-
/// ### Example
990-
///
991-
/// ```rust
992-
/// # #![allow(unused)]
993-
/// struct SemiPriv;
994-
///
995-
/// mod m1 {
996-
/// struct Priv;
997-
/// impl super::SemiPriv {
998-
/// pub fn f(_: Priv) {}
999-
/// }
1000-
/// }
1001-
/// # fn main() {}
1002-
/// ```
1003-
///
1004-
/// {{produces}}
1005-
///
1006-
/// ### Explanation
1007-
///
1008-
/// The visibility rules are intended to prevent exposing private items in
1009-
/// public interfaces. This is a [future-incompatible] lint to transition
1010-
/// this to a hard error in the future. See [issue #34537] for more
1011-
/// details.
1012-
///
1013-
/// [issue #34537]: https://github.com/rust-lang/rust/issues/34537
1014-
/// [future-incompatible]: ../index.md#future-incompatible-lints
1015-
pub PRIVATE_IN_PUBLIC,
1016-
Warn,
1017-
"detect private items in public interfaces not caught by the old implementation",
1018-
@future_incompatible = FutureIncompatibleInfo {
1019-
reference: "issue #34537 <https://github.com/rust-lang/rust/issues/34537>",
1020-
};
1021-
}
1022-
1023985
declare_lint! {
1024986
/// The `invalid_alignment` lint detects dereferences of misaligned pointers during
1025987
/// constant evaluation.
@@ -3415,7 +3377,6 @@ declare_lint_pass! {
34153377
PATTERNS_IN_FNS_WITHOUT_BODY,
34163378
POINTER_STRUCTURAL_MATCH,
34173379
PRIVATE_BOUNDS,
3418-
PRIVATE_IN_PUBLIC,
34193380
PRIVATE_INTERFACES,
34203381
PROC_MACRO_BACK_COMPAT,
34213382
PROC_MACRO_DERIVE_RESOLUTION_FALLBACK,
@@ -4334,9 +4295,7 @@ declare_lint! {
43344295
/// ### Example
43354296
///
43364297
/// ```rust,compile_fail
4337-
/// # #![feature(type_privacy_lints)]
43384298
/// # #![allow(unused)]
4339-
/// # #![allow(private_in_public)]
43404299
/// #![deny(private_interfaces)]
43414300
/// struct SemiPriv;
43424301
///
@@ -4357,9 +4316,8 @@ declare_lint! {
43574316
/// Having something private in primary interface guarantees that
43584317
/// the item will be unusable from outer modules due to type privacy.
43594318
pub PRIVATE_INTERFACES,
4360-
Allow,
4319+
Warn,
43614320
"private type in primary interface of an item",
4362-
@feature_gate = sym::type_privacy_lints;
43634321
}
43644322

43654323
declare_lint! {
@@ -4370,8 +4328,6 @@ declare_lint! {
43704328
/// ### Example
43714329
///
43724330
/// ```rust,compile_fail
4373-
/// # #![feature(type_privacy_lints)]
4374-
/// # #![allow(private_in_public)]
43754331
/// # #![allow(unused)]
43764332
/// #![deny(private_bounds)]
43774333
///
@@ -4389,9 +4345,8 @@ declare_lint! {
43894345
/// Having private types or traits in item bounds makes it less clear what interface
43904346
/// the item actually provides.
43914347
pub PRIVATE_BOUNDS,
4392-
Allow,
4348+
Warn,
43934349
"private type in secondary interface of an item",
4394-
@feature_gate = sym::type_privacy_lints;
43954350
}
43964351

43974352
declare_lint! {

‎compiler/rustc_middle/src/hir/map/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,6 @@ pub(super) fn crate_hash(tcx: TyCtxt<'_>, _: LocalCrate) -> Svh {
12261226
tcx.stable_crate_id(LOCAL_CRATE).hash_stable(&mut hcx, &mut stable_hasher);
12271227
// Hash visibility information since it does not appear in HIR.
12281228
resolutions.visibilities.hash_stable(&mut hcx, &mut stable_hasher);
1229-
resolutions.has_pub_restricted.hash_stable(&mut hcx, &mut stable_hasher);
12301229
stable_hasher.finish()
12311230
});
12321231

‎compiler/rustc_middle/src/ty/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@ pub struct ResolverOutputs {
162162
#[derive(Debug)]
163163
pub struct ResolverGlobalCtxt {
164164
pub visibilities: FxHashMap<LocalDefId, Visibility>,
165-
/// This field is used to decide whether we should make `PRIVATE_IN_PUBLIC` a hard error.
166-
pub has_pub_restricted: bool,
167165
/// Item with a given `LocalDefId` was defined during macro expansion with ID `ExpnId`.
168166
pub expn_that_defined: FxHashMap<LocalDefId, ExpnId>,
169167
pub effective_visibilities: EffectiveVisibilities,

‎compiler/rustc_privacy/messages.ftl

-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ privacy_in_public_interface = {$vis_descr} {$kind} `{$descr}` in public interfac
1111
1212
privacy_item_is_private = {$kind} `{$descr}` is private
1313
.label = private {$kind}
14-
privacy_private_in_public_lint =
15-
{$vis_descr} {$kind} `{$descr}` in public interface (error {$kind ->
16-
[trait] E0445
17-
*[other] E0446
18-
})
1914
2015
privacy_private_interface_or_bounds_lint = {$ty_kind} `{$ty_descr}` is more private than the item `{$item_descr}`
2116
.item_label = {$item_kind} `{$item_descr}` is reachable at visibility `{$item_vis_descr}`

‎compiler/rustc_privacy/src/errors.rs

-23
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,6 @@ pub struct UnnamedItemIsPrivate {
4747
pub kind: &'static str,
4848
}
4949

50-
// Duplicate of `InPublicInterface` but with a different error code, shares the same slug.
51-
#[derive(Diagnostic)]
52-
#[diag(privacy_in_public_interface, code = "E0445")]
53-
pub struct InPublicInterfaceTraits<'a> {
54-
#[primary_span]
55-
#[label]
56-
pub span: Span,
57-
pub vis_descr: &'static str,
58-
pub kind: &'a str,
59-
pub descr: DiagnosticArgFromDisplay<'a>,
60-
#[label(privacy_visibility_label)]
61-
pub vis_span: Span,
62-
}
63-
64-
// Duplicate of `InPublicInterfaceTraits` but with a different error code, shares the same slug.
6550
#[derive(Diagnostic)]
6651
#[diag(privacy_in_public_interface, code = "E0446")]
6752
pub struct InPublicInterface<'a> {
@@ -91,14 +76,6 @@ pub struct FromPrivateDependencyInPublicInterface<'a> {
9176
pub krate: Symbol,
9277
}
9378

94-
#[derive(LintDiagnostic)]
95-
#[diag(privacy_private_in_public_lint)]
96-
pub struct PrivateInPublicLint<'a> {
97-
pub vis_descr: &'static str,
98-
pub kind: &'a str,
99-
pub descr: DiagnosticArgFromDisplay<'a>,
100-
}
101-
10279
#[derive(LintDiagnostic)]
10380
#[diag(privacy_unnameable_types_lint)]
10481
pub struct UnnameableTypesLint<'a> {

0 commit comments

Comments
 (0)