---

yaml
---
r: 48722
b: refs/heads/snap-stage3
c: 387aa36
h: refs/heads/master
v: v3

Author: z0w0

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4f238503d8730486fd9c72c71f1043a2f925299d
+refs/heads/snap-stage3: 387aa3668a4ff865c5554a9f3dac2d339f8ef7aa
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustdoc/rustdoc.rc

@@ -116,8 +116,7 @@ fn run(config: Config) {
             // Remove things marked doc(hidden)
             prune_hidden_pass::mk_pass(),
             // Remove things that are private
-            // XXX enable this after 'export' is removed in favor of 'pub'
-            // prune_private_pass::mk_pass(),
+            prune_private_pass::mk_pass(),
             // Extract brief documentation from the full descriptions
             desc_to_brief_pass::mk_pass(),
             // Massage the text to remove extra indentation

branches/snap-stage3/src/librustdoc/tystr_pass.rs

@@ -75,7 +75,7 @@ fn get_fn_sig(srv: astsrv::Srv, fn_id: doc::AstId) -> Option<~str> {
             ident: ident,
             node: ast::foreign_item_fn(ref decl, _, ref tys), _
           }, _, _) => {
-            Some(pprust::fun_to_str(decl, ident, None, tys,
+            Some(pprust::fun_to_str(decl, ident, tys,
                                     extract::interner()))
           }
           _ => fail!(~"get_fn_sig: fn_id not bound to a fn item")
@@ -215,7 +215,6 @@ fn get_method_sig(
                       Some(pprust::fun_to_str(
                           &ty_m.decl,
                           ty_m.ident,
-                          Some(ty_m.self_ty.node),
                           &ty_m.generics,
                           extract::interner()
                       ))
@@ -224,7 +223,6 @@ fn get_method_sig(
                       Some(pprust::fun_to_str(
                           &m.decl,
                           m.ident,
-                          Some(m.self_ty.node),
                           &m.generics,
                           extract::interner()
                       ))
@@ -244,7 +242,6 @@ fn get_method_sig(
                     Some(pprust::fun_to_str(
                         &method.decl,
                         method.ident,
-                        Some(method.self_ty.node),
                         &method.generics,
                         extract::interner()
                     ))

branches/snap-stage3/src/libsyntax/print/pprust.rs

@@ -181,11 +181,10 @@ pub fn path_to_str(&&p: @ast::path, intr: @ident_interner) -> ~str {
 }
 
 pub fn fun_to_str(decl: &ast::fn_decl, name: ast::ident,
-                  opt_self_ty: Option<ast::self_ty_>,
                   generics: &ast::Generics, intr: @ident_interner) -> ~str {
     do io::with_str_writer |wr| {
         let s = rust_printer(wr, intr);
-        print_fn(s, decl, None, name, generics, opt_self_ty, ast::inherited);
+        print_fn(s, decl, None, name, generics, None, ast::inherited);
         end(s); // Close the head box
         end(s); // Close the outer box
         eof(s.s);