rustc_privacy: Fix bugs in SanePrivacyVisitor

src/test/compile-fail/privacy-sanity.rs

@@ -0,0 +1,113 @@
+// 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.
+
+#![feature(associated_consts)]
+#![feature(optin_builtin_traits)]
+
+trait MarkerTr {}
+pub trait Tr {
+    fn f();
+    const C: u8;
+    type T;
+}
+pub struct S {
+    pub a: u8
+}
+struct Ts(pub u8);
+
+pub impl MarkerTr for .. {} //~ ERROR unnecessary visibility qualifier
+pub impl Tr for S {  //~ ERROR unnecessary visibility qualifier
+    pub fn f() {} //~ ERROR unnecessary visibility qualifier
+    pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier
+    pub type T = u8; //~ ERROR unnecessary visibility qualifier
+}
+pub impl S { //~ ERROR unnecessary visibility qualifier
+    pub fn f() {}
+    pub const C: u8 = 0;
+    // pub type T = u8;
+}
+pub extern "C" { //~ ERROR unnecessary visibility qualifier
+    pub fn f();
+    pub static St: u8;
+}
+
+const MAIN: u8 = {
+    trait MarkerTr {}
+    pub trait Tr { //~ ERROR visibility has no effect inside functions or block
+        fn f();
+        const C: u8;
+        type T;
+    }
+    pub struct S { //~ ERROR visibility has no effect inside functions or block
+        pub a: u8 //~ ERROR visibility has no effect inside functions or block
+    }
+    struct Ts(pub u8); //~ ERROR visibility has no effect inside functions or block
+
+    pub impl MarkerTr for .. {} //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+    pub impl Tr for S {  //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+        pub fn f() {} //~ ERROR unnecessary visibility qualifier
+        //~^ ERROR visibility has no effect inside functions or block
+        pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier
+        //~^ ERROR visibility has no effect inside functions or block
+        pub type T = u8; //~ ERROR unnecessary visibility qualifier
+        //~^ ERROR visibility has no effect inside functions or block
+    }
+    pub impl S { //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+        pub fn f() {} //~ ERROR visibility has no effect inside functions or block
+        pub const C: u8 = 0; //~ ERROR visibility has no effect inside functions or block
+        // pub type T = u8; // ERROR visibility has no effect inside functions or block
+    }
+    pub extern "C" { //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+        pub fn f(); //~ ERROR visibility has no effect inside functions or block
+        pub static St: u8; //~ ERROR visibility has no effect inside functions or block
+    }
+
+    0
+};
+
+fn main() {
+    trait MarkerTr {}
+    pub trait Tr { //~ ERROR visibility has no effect inside functions or block
+        fn f();
+        const C: u8;
+        type T;
+    }
+    pub struct S { //~ ERROR visibility has no effect inside functions or block
+        pub a: u8 //~ ERROR visibility has no effect inside functions or block
+    }
+    struct Ts(pub u8); //~ ERROR visibility has no effect inside functions or block
+
+    pub impl MarkerTr for .. {} //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+    pub impl Tr for S {  //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+        pub fn f() {} //~ ERROR unnecessary visibility qualifier
+        //~^ ERROR visibility has no effect inside functions or block
+        pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier
+        //~^ ERROR visibility has no effect inside functions or block
+        pub type T = u8; //~ ERROR unnecessary visibility qualifier
+        //~^ ERROR visibility has no effect inside functions or block
+    }
+    pub impl S { //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+        pub fn f() {} //~ ERROR visibility has no effect inside functions or block
+        pub const C: u8 = 0; //~ ERROR visibility has no effect inside functions or block
+        // pub type T = u8; // ERROR visibility has no effect inside functions or block
+    }
+    pub extern "C" { //~ ERROR unnecessary visibility qualifier
+    //~^ ERROR visibility has no effect inside functions or block
+        pub fn f(); //~ ERROR visibility has no effect inside functions or block
+        pub static St: u8; //~ ERROR visibility has no effect inside functions or block
+    }
+}

src/test/run-pass/const-block-item.rs

@@ -20,11 +20,6 @@ static BLOCK_USE: usize = {
     100
 };
 
-static BLOCK_PUB_USE: usize = {
-    pub use foo::Value;
-    200
-};
-
 static BLOCK_STRUCT_DEF: usize = {
     struct Foo {
         a: usize
@@ -48,7 +43,6 @@ static BLOCK_MACRO_RULES: usize = {
 
 pub fn main() {
     assert_eq!(BLOCK_USE, 100);
-    assert_eq!(BLOCK_PUB_USE, 200);
     assert_eq!(BLOCK_STRUCT_DEF, 300);
     assert_eq!(BLOCK_FN_DEF(390), 400);
     assert_eq!(BLOCK_MACRO_RULES, 412);