diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs index 906e584e0ecb..fc2e2ca66203 100644 --- a/src/librustc_privacy/lib.rs +++ b/src/librustc_privacy/lib.rs @@ -783,11 +783,16 @@ impl<'a, 'tcx> Visitor<'tcx> for TypePrivacyVisitor<'a, 'tcx> { } // Prohibit access to associated items with insufficient nominal visibility. + // + // Additionally, until better reachability analysis for macros 2.0 is available, + // we prohibit access to private statics from other crates, this allows to give + // more code internal visibility at link time. (Access to private functions + // is already prohibited by type privacy for funciton types.) fn visit_qpath(&mut self, qpath: &'tcx hir::QPath, id: ast::NodeId, span: Span) { let def = match *qpath { hir::QPath::Resolved(_, ref path) => match path.def { Def::Method(..) | Def::AssociatedConst(..) | - Def::AssociatedTy(..) => Some(path.def), + Def::AssociatedTy(..) | Def::Static(..) => Some(path.def), _ => None, } hir::QPath::TypeRelative(..) => { @@ -797,7 +802,8 @@ impl<'a, 'tcx> Visitor<'tcx> for TypePrivacyVisitor<'a, 'tcx> { }; if let Some(def) = def { let def_id = def.def_id(); - if !self.item_is_accessible(def_id) { + let is_local_static = if let Def::Static(..) = def { def_id.is_local() } else { false }; + if !self.item_is_accessible(def_id) && !is_local_static { let name = match *qpath { hir::QPath::Resolved(_, ref path) => format!("{}", path), hir::QPath::TypeRelative(_, ref segment) => segment.name.to_string(), diff --git a/src/test/compile-fail/auxiliary/private-inferred-type.rs b/src/test/compile-fail/auxiliary/private-inferred-type.rs index 7627f5dc0cd0..fc43765f63ce 100644 --- a/src/test/compile-fail/auxiliary/private-inferred-type.rs +++ b/src/test/compile-fail/auxiliary/private-inferred-type.rs @@ -11,6 +11,7 @@ #![feature(decl_macro)] fn priv_fn() {} +static PRIV_STATIC: u8 = 0; enum PrivEnum { Variant } pub enum PubEnum { Variant } trait PrivTrait { fn method() {} } @@ -34,6 +35,7 @@ impl Pub { pub macro m() { priv_fn; + PRIV_STATIC; PrivEnum::Variant; PubEnum::Variant; ::method; diff --git a/src/test/compile-fail/private-inferred-type-3.rs b/src/test/compile-fail/private-inferred-type-3.rs index c0ba38b24020..0c393f02323e 100644 --- a/src/test/compile-fail/private-inferred-type-3.rs +++ b/src/test/compile-fail/private-inferred-type-3.rs @@ -11,6 +11,7 @@ // aux-build:private-inferred-type.rs // error-pattern:type `fn() {ext::priv_fn}` is private +// error-pattern:static `PRIV_STATIC` is private // error-pattern:type `ext::PrivEnum` is private // error-pattern:type `fn() {::method}` is private // error-pattern:type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct::{{constructor}}}` is pr diff --git a/src/test/compile-fail/private-inferred-type.rs b/src/test/compile-fail/private-inferred-type.rs index 95e3732d6134..c50d7f59b8e0 100644 --- a/src/test/compile-fail/private-inferred-type.rs +++ b/src/test/compile-fail/private-inferred-type.rs @@ -15,6 +15,7 @@ mod m { fn priv_fn() {} + static PRIV_STATIC: u8 = 0; enum PrivEnum { Variant } pub enum PubEnum { Variant } trait PrivTrait { fn method() {} } @@ -47,6 +48,7 @@ mod m { pub macro m() { priv_fn; //~ ERROR type `fn() {m::priv_fn}` is private + PRIV_STATIC; // OK, not cross-crate PrivEnum::Variant; //~ ERROR type `m::PrivEnum` is private PubEnum::Variant; // OK ::method; //~ ERROR type `fn() {::method}` is private