Always report PRIVATE_IN_PUBLIC violations as hard errors when

the feature `pub_restricted` is enabled.
rust-lang · Apr 16, 2016 · daec3fe · daec3fe
1 parent 44c78ee
commit daec3fe
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
@@ -1023,7 +1023,8 @@ impl<'a, 'tcx: 'a, 'v> Visitor<'v> for SearchInterfaceForPrivateItemsVisitor<'a,
                             self.min_visibility = vis;
                         }
                         if !vis.is_at_least(self.required_visibility, &self.tcx.map) {
-                            if self.old_error_set.contains(&ty.id) {
+                            if self.tcx.sess.features.borrow().pub_restricted ||
+                               self.old_error_set.contains(&ty.id) {
                                 span_err!(self.tcx.sess, ty.span, E0446,
                                           "private type in public interface");
                             } else {
@@ -1053,7 +1054,8 @@ impl<'a, 'tcx: 'a, 'v> Visitor<'v> for SearchInterfaceForPrivateItemsVisitor<'a,
                 self.min_visibility = vis;
             }
             if !vis.is_at_least(self.required_visibility, &self.tcx.map) {
-                if self.old_error_set.contains(&trait_ref.ref_id) {
+                if self.tcx.sess.features.borrow().pub_restricted ||
+                   self.old_error_set.contains(&trait_ref.ref_id) {
                     span_err!(self.tcx.sess, trait_ref.path.span, E0445,
                               "private trait in public interface");
                 } else {