mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #115633 - compiler-errors:PRIVATE_BOUNDS-lint-node, r=petrochenkov

Browse Source 
Lint node for `PRIVATE_BOUNDS`/`PRIVATE_INTERFACES` is the item which names the private type

The HIR that the `PRIVATE_BOUNDS` lint should be attached to is the item that has the *bounds*, not the private type. This PR also aligns this behavior with the `EXPORTED_PRIVATE_DEPENDENCIES` lint, which also requires putting the `allow` on the item that names the private type.

Fixes #115475

r? petrochenkov
This commit is contained in:
Guillaume Gomez 2023-09-08 14:10:51 +02:00 committed by GitHub
commit e3b6122530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_privacy/src/lib.rs
View File

@ -1463,14 +1463,15 @@ impl SearchInterfaceForPrivateItemsVisitor<'_> {
}; };
let vis = self.tcx.local_visibility(local_def_id); let vis = self.tcx.local_visibility(local_def_id);
let hir_id = self.tcx.hir().local_def_id_to_hir_id(local_def_id);
let span = self.tcx.def_span(self.item_def_id.to_def_id()); let span = self.tcx.def_span(self.item_def_id.to_def_id());
let vis_span = self.tcx.def_span(def_id); let vis_span = self.tcx.def_span(def_id);
if self.in_assoc_ty && !vis.is_at_least(self.required_visibility, self.tcx) { if self.in_assoc_ty && !vis.is_at_least(self.required_visibility, self.tcx) {
let vis_descr = match vis { let vis_descr = match vis {
ty::Visibility::Public => "public", ty::Visibility::Public => "public",
ty::Visibility::Restricted(vis_def_id) => { ty::Visibility::Restricted(vis_def_id) => {
if vis_def_id == self.tcx.parent_module(hir_id).to_local_def_id() { if vis_def_id
== self.tcx.parent_module_from_def_id(local_def_id).to_local_def_id()
{
"private" "private"
} else if vis_def_id.is_top_level_module() { } else if vis_def_id.is_top_level_module() {
"crate-private" "crate-private"
@ -1504,7 +1505,7 @@ impl SearchInterfaceForPrivateItemsVisitor<'_> {
}; };
self.tcx.emit_spanned_lint( self.tcx.emit_spanned_lint(
lint, lint,
hir_id, self.tcx.hir().local_def_id_to_hir_id(self.item_def_id),
span, span,
PrivateInterfacesOrBoundsLint { PrivateInterfacesOrBoundsLint {
item_span: span, item_span: span,

7
tests/ui/privacy/private-bounds-locally-allowed.rs Normal file
View File

@ -0,0 +1,7 @@
// check-pass
// compile-flags: --crate-type=lib
#[allow(private_bounds)]
pub trait Foo: FooImpl {}
trait FooImpl {}