---

yaml
---
r: 146685
b: refs/heads/try2
c: 4ddeef3
h: refs/heads/master
i:
  146683: a15b172
v: v3

Author: alexcrichton

[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: 4dded4345fc148edea0e4b8354728c728784883f
+refs/heads/try2: 4ddeef35e52fdd80424897f3f9a253220691c1ac
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/rust.md

@@ -1550,7 +1550,6 @@ keyword for struct fields and enum variants). When an item is declared as `pub`,
 it can be thought of as being accessible to the outside world. For example:
 
 ~~~~
-# fn main() {}
 // Declare a private struct
 struct Foo;
 

branches/try2/doc/tutorial-container.md

@@ -87,7 +87,6 @@ Reaching the end of the iterator is signalled by returning `None` instead of
 `Some(item)`:
 
 ~~~
-# fn main() {}
 /// A stream of N zeroes
 struct ZeroStream {
     priv remaining: uint
@@ -302,7 +301,6 @@ the iterator can provide better information.
 The `ZeroStream` from earlier can provide an exact lower and upper bound:
 
 ~~~
-# fn main() {}
 /// A stream of N zeroes
 struct ZeroStream {
     priv remaining: uint

branches/try2/doc/tutorial-macros.md

@@ -216,7 +216,7 @@ Now consider code like the following:
 
 ~~~~
 # enum t1 { good_1(t2, uint), bad_1 };
-# struct t2 { body: t3 }
+# pub struct t2 { body: t3 }
 # enum t3 { good_2(uint), bad_2};
 # fn f(x: t1) -> uint {
 match x {
@@ -262,7 +262,7 @@ macro_rules! biased_match (
 )
 
 # enum t1 { good_1(t2, uint), bad_1 };
-# struct t2 { body: t3 }
+# pub struct t2 { body: t3 }
 # enum t3 { good_2(uint), bad_2};
 # fn f(x: t1) -> uint {
 biased_match!((x)       ~ (good_1(g1, val)) else { return 0 };
@@ -364,7 +364,7 @@ macro_rules! biased_match (
 
 
 # enum t1 { good_1(t2, uint), bad_1 };
-# struct t2 { body: t3 }
+# pub struct t2 { body: t3 }
 # enum t3 { good_2(uint), bad_2};
 # fn f(x: t1) -> uint {
 biased_match!(

branches/try2/doc/tutorial.md

@@ -2568,7 +2568,6 @@ pub fn foo() { bar(); }
 ~~~
 // c.rs
 pub fn bar() { println("Baz!"); }
-# fn main() {}
 ~~~
 
 There also exist two short forms for importing multiple names at once:
@@ -2744,7 +2743,7 @@ Therefore, if you plan to compile your crate as a library, you should annotate i
 #[link(name = "farm", vers = "2.5")];
 
 // ...
-# fn farm() {}
+# pub fn farm() {}
 ~~~~
 
 You can also in turn require in a `extern mod` statement that certain link metadata items match some criteria.
@@ -2770,7 +2769,7 @@ or setting the crate type (library or executable) explicitly:
 
 // Turn on a warning
 #[warn(non_camel_case_types)]
-# fn farm() {}
+# pub fn farm() {}
 ~~~~
 
 If you're compiling your crate with `rustpkg`,
@@ -2791,9 +2790,7 @@ We define two crates, and use one of them as a library in the other.
 ~~~~
 // world.rs
 #[link(name = "world", vers = "0.42")];
-# extern mod extra;
 pub fn explore() -> &'static str { "world" }
-# fn main() {}
 ~~~~
 
 ~~~~ {.xfail-test}

branches/try2/mk/ctags.mk

@@ -15,27 +15,7 @@
 
 .PHONY: TAGS.emacs TAGS.vi
 
-# This is using a blacklist approach, probably more durable than a whitelist.
-# We exclude: external dependencies (llvm, libuv, gyp, rt/{msvc,sundown,vg}),
-# tests (compiletest, test) and a couple of other things (rt/arch, etc)
-CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,,\
-				$(patsubst ${CFG_SRC_DIR}src/libuv,,\
-				$(patsubst ${CFG_SRC_DIR}src/compiletest,,\
-				$(patsubst ${CFG_SRC_DIR}src/test,,\
-				$(patsubst ${CFG_SRC_DIR}src/gyp,,\
-				$(patsubst ${CFG_SRC_DIR}src/etc,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/arch,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/msvc,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/sundown,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/vg,,\
-				$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*)\
-				)))))))))))
-CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
-# We could use `--languages=Rust`, but there is value in producing tags for the
-# C++ parts of the code base too (at the time of writing, those are .h and .cpp
-# files in src/rt, src/rt/sync and src/rustllvm); we mainly just want to
-# exclude the external dependencies.
+CTAGS_OPTS=--options=${CFG_SRC_DIR}/src/etc/ctags.rust -R ${CFG_SRC_DIR}/src
 
 TAGS.emacs:
 	ctags -e -f $@ ${CTAGS_OPTS}

branches/try2/src/libextra/sort.rs

@@ -846,7 +846,7 @@ mod tests {
 
     fn check_sort(v1: &[int], v2: &[int]) {
         let len = v1.len();
-        fn le(a: &int, b: &int) -> bool { *a <= *b }
+        pub fn le(a: &int, b: &int) -> bool { *a <= *b }
         let f = le;
         let v3 = merge_sort::<int>(v1, f);
         let mut i = 0u;
@@ -876,7 +876,7 @@ mod tests {
 
     #[test]
     fn test_merge_sort_mutable() {
-        fn le(a: &int, b: &int) -> bool { *a <= *b }
+        pub fn le(a: &int, b: &int) -> bool { *a <= *b }
         let v1 = ~[3, 2, 1];
         let v2 = merge_sort(v1, le);
         assert_eq!(v2, ~[1, 2, 3]);

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

@@ -13,7 +13,6 @@
 //! which are available for use externally when compiled as a library.
 
 use std::hashmap::{HashSet, HashMap};
-use std::util;
 
 use middle::resolve;
 use middle::ty;
@@ -276,7 +275,6 @@ impl<'self> Visitor<()> for EmbargoVisitor<'self> {
 struct PrivacyVisitor<'self> {
     tcx: ty::ctxt,
     curitem: ast::NodeId,
-    in_fn: bool,
 
     // See comments on the same field in `EmbargoVisitor`.
     path_all_public_items: &'self ExportedItems,
@@ -690,63 +688,6 @@ impl<'self> PrivacyVisitor<'self> {
             }
         }
     }
-
-    /// When inside of something like a function or a method, visibility has no
-    /// control over anything so this forbids any mention of any visibility
-    fn check_all_inherited(&self, item: @ast::item) {
-        let tcx = self.tcx;
-        let check_inherited = |sp: Span, vis: ast::visibility| {
-            if vis != ast::inherited {
-                tcx.sess.span_err(sp, "visibility has no effect inside functions");
-            }
-        };
-        let check_struct = |def: &@ast::struct_def| {
-            for f in def.fields.iter() {
-               match f.node.kind {
-                    ast::named_field(_, p) => check_inherited(f.span, p),
-                    ast::unnamed_field => {}
-                }
-            }
-        };
-        check_inherited(item.span, item.vis);
-        match item.node {
-            ast::item_impl(_, _, _, ref methods) => {
-                for m in methods.iter() {
-                    check_inherited(m.span, m.vis);
-                }
-            }
-            ast::item_foreign_mod(ref fm) => {
-                for i in fm.items.iter() {
-                    check_inherited(i.span, i.vis);
-                }
-            }
-            ast::item_enum(ref def, _) => {
-                for v in def.variants.iter() {
-                    check_inherited(v.span, v.node.vis);
-
-                    match v.node.kind {
-                        ast::struct_variant_kind(ref s) => check_struct(s),
-                        ast::tuple_variant_kind(*) => {}
-                    }
-                }
-            }
-
-            ast::item_struct(ref def, _) => check_struct(def),
-
-            ast::item_trait(_, _, ref methods) => {
-                for m in methods.iter() {
-                    match *m {
-                        ast::required(*) => {}
-                        ast::provided(ref m) => check_inherited(m.span, m.vis),
-                    }
-                }
-            }
-
-            ast::item_static(*) |
-            ast::item_fn(*) | ast::item_mod(*) | ast::item_ty(*) |
-            ast::item_mac(*) => {}
-        }
-    }
 }
 
 impl<'self> Visitor<()> for PrivacyVisitor<'self> {
@@ -758,28 +699,12 @@ impl<'self> Visitor<()> for PrivacyVisitor<'self> {
         }
 
         // Disallow unnecessary visibility qualifiers
-        if self.in_fn {
-            self.check_all_inherited(item);
-        } else {
-            self.check_sane_privacy(item);
-        }
+        self.check_sane_privacy(item);
 
-        let orig_curitem = util::replace(&mut self.curitem, item.id);
-        let orig_in_fn = util::replace(&mut self.in_fn, match item.node {
-            ast::item_mod(*) => false, // modules turn privacy back on
-            _ => self.in_fn,           // otherwise we inherit
-        });
+        let orig_curitem = self.curitem;
+        self.curitem = item.id;
         visit::walk_item(self, item, ());
         self.curitem = orig_curitem;
-        self.in_fn = orig_in_fn;
-    }
-
-    fn visit_fn(&mut self, fk: &visit::fn_kind, fd: &ast::fn_decl,
-                b: &ast::Block, s: Span, n: ast::NodeId, _: ()) {
-        // This catches both functions and methods
-        let orig_in_fn = util::replace(&mut self.in_fn, true);
-        visit::walk_fn(self, fk, fd, b, s, n, ());
-        self.in_fn = orig_in_fn;
     }
 
     fn visit_expr(&mut self, expr: @ast::Expr, _: ()) {
@@ -982,7 +907,6 @@ pub fn check_crate(tcx: ty::ctxt,
     {
         let mut visitor = PrivacyVisitor {
             curitem: ast::DUMMY_NODE_ID,
-            in_fn: false,
             tcx: tcx,
             path_all_public_items: &path_all_public_items,
             parents: &parents,