---

yaml
---
r: 148395
b: refs/heads/try2
c: d0f6ef0
h: refs/heads/master
i:
  148393: 996590e
  148391: 2bf2a7f
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 27843133448df3315af1a07dc6700d7754709a97
+refs/heads/try2: d0f6ef080bb69ce4370c04c92cc92b9a860e5725
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/front/std_inject.rs

@@ -73,7 +73,7 @@ impl fold::Folder for StandardLibraryInjector {
                                          with_version("std"),
                                          ast::DUMMY_NODE_ID),
             attrs: ~[],
-            vis: ast::Private,
+            vis: ast::Inherited,
             span: DUMMY_SP
         }];
 
@@ -83,15 +83,15 @@ impl fold::Folder for StandardLibraryInjector {
                                              with_version("green"),
                                              ast::DUMMY_NODE_ID),
                 attrs: ~[],
-                vis: ast::Private,
+                vis: ast::Inherited,
                 span: DUMMY_SP
             });
             vis.push(ast::ViewItem {
                 node: ast::ViewItemExternMod(self.sess.ident_of("rustuv"),
                                              with_version("rustuv"),
                                              ast::DUMMY_NODE_ID),
                 attrs: ~[],
-                vis: ast::Private,
+                vis: ast::Inherited,
                 span: DUMMY_SP
             });
         }
@@ -147,7 +147,7 @@ impl fold::Folder for StandardLibraryInjector {
         let vi2 = ast::ViewItem {
             node: ast::ViewItemUse(~[vp]),
             attrs: ~[],
-            vis: ast::Private,
+            vis: ast::Inherited,
             span: DUMMY_SP,
         };
 

branches/try2/src/librustc/front/test.rs

@@ -301,7 +301,7 @@ fn mk_std(cx: &TestCtxt) -> ast::ViewItem {
     ast::ViewItem {
         node: vi,
         attrs: ~[],
-        vis: ast::Public,
+        vis: ast::Inherited,
         span: DUMMY_SP
     }
 }

branches/try2/src/librustc/middle/privacy.rs

@@ -839,6 +839,32 @@ impl Visitor<()> for SanePrivacyVisitor {
         visit::walk_fn(self, fk, fd, b, s, n, ());
         self.in_fn = orig_in_fn;
     }
+
+    fn visit_view_item(&mut self, i: &ast::ViewItem, _: ()) {
+        match i.vis {
+            ast::Inherited => {}
+            ast::Private => {
+                self.tcx.sess.span_err(i.span, "unnecessary visibility \
+                                                qualifier");
+            }
+            ast::Public => {
+                if self.in_fn {
+                    self.tcx.sess.span_err(i.span, "unnecessary `pub`, imports \
+                                                    in functions are never \
+                                                    reachable");
+                } else {
+                    match i.node {
+                        ast::ViewItemExternMod(..) => {
+                            self.tcx.sess.span_err(i.span, "`pub` visibility \
+                                                            is not allowed");
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+        visit::walk_view_item(self, i, ());
+    }
 }
 
 impl SanePrivacyVisitor {

branches/try2/src/libsyntax/ext/quote.rs

@@ -648,7 +648,7 @@ fn expand_wrapper(cx: &ExtCtxt,
                   sp: Span,
                   cx_expr: @ast::Expr,
                   expr: @ast::Expr) -> @ast::Expr {
-    let uses = ~[ cx.view_use_glob(sp, ast::Public,
+    let uses = ~[ cx.view_use_glob(sp, ast::Inherited,
                                    ids_ext(~[~"syntax",
                                              ~"ext",
                                              ~"quote",

branches/try2/src/test/compile-fail/issue-9957.rs

@@ -0,0 +1,23 @@
+// Copyright 2014 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 extern mod std; //~ ERROR: `pub` visibility is not allowed
+priv extern mod std; //~ ERROR: unnecessary visibility qualifier
+extern mod std;
+
+pub use std::bool;
+priv use std::bool; //~ ERROR: unnecessary visibility qualifier
+use std::bool;
+
+fn main() {
+    pub use std::bool; //~ ERROR: imports in functions are never reachable
+    priv use std::bool; //~ ERROR: unnecessary visibility qualifier
+    use std::bool;
+}

branches/try2/src/test/run-pass/issue-9259.rs

@@ -0,0 +1,23 @@
+// Copyright 2014 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.
+
+struct A<'a> {
+    a: &'a [~str],
+    b: Option<&'a [~str]>,
+}
+
+pub fn main() {
+    let b = &[~"foo"];
+    let a = A {
+        a: &[~"test"],
+        b: Some(b),
+    };
+    assert_eq!(a.b.get_ref()[0].as_slice(), "foo");
+}