Skip to content

update privacy checker to work with associated types #22990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/librustc_privacy/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1376,10 +1376,11 @@ impl<'a, 'tcx, 'v> Visitor<'v> for VisiblePrivateTypesVisitor<'a, 'tcx> {
}
}
Some(ref tr) => {
// Any private types in a trait impl fall into two
// Any private types in a trait impl fall into three
// categories.
// 1. mentioned in the trait definition
// 2. mentioned in the type params/generics
// 3. mentioned in the associated types of the impl
//
// Those in 1. can only occur if the trait is in
// this crate and will've been warned about on the
Expand All @@ -1389,6 +1390,16 @@ impl<'a, 'tcx, 'v> Visitor<'v> for VisiblePrivateTypesVisitor<'a, 'tcx> {
// Those in 2. are warned via walk_generics and this
// call here.
visit::walk_path(self, &tr.path);

// Those in 3. are warned with this call.
for impl_item in impl_items {
match *impl_item {
ast::MethodImplItem(..) => {},
ast::TypeImplItem(ref typedef) => {
self.visit_ty(&typedef.typ);
}
}
}
}
}
} else if trait_ref.is_none() && self_is_public_path {
Expand Down
41 changes: 41 additions & 0 deletions src/test/compile-fail/issue-22912.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

pub struct PublicType;
struct PrivateType;

pub trait PublicTrait {
type Item;
}

trait PrivateTrait {
type Item;
}

impl PublicTrait for PublicType {
type Item = PrivateType; //~ ERROR private type in exported type signature
}

// OK
impl PublicTrait for PrivateType {
type Item = PrivateType;
}

// OK
impl PrivateTrait for PublicType {
type Item = PrivateType;
}

// OK
impl PrivateTrait for PrivateType {
type Item = PrivateType;
}

fn main() {}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub trait Foo {
}

#[derive(PartialEq)]
struct Bar;
pub struct Bar;

impl Foo for int {
type A = uint;
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/associated-types-eq-obj.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub trait Foo {
fn boo(&self) -> <Self as Foo>::A;
}

struct Bar;
pub struct Bar;

impl Foo for char {
type A = Bar;
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/associated-types-return.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub trait Foo {
}

#[derive(PartialEq)]
struct Bar;
pub struct Bar;

impl Foo for int {
type A = uint;
Expand Down