---

yaml
---
r: 40493
b: refs/heads/dist-snap
c: 145e023
h: refs/heads/master
i:
  40491: 3a65c5e
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: a27f5239bdeb48055b40ccf3c3cd176e1971b2ac
+refs/heads/dist-snap: 145e02347e88176e342631033abb748c51db45e8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustdoc/astsrv.rs

@@ -21,36 +21,29 @@ use rustc::back::link;
 use rustc::metadata::filesearch;
 use rustc::front;
 
-export Ctxt;
-export CtxtHandler;
-export Srv;
-export from_str;
-export from_file;
-export exec;
-
-type Ctxt = {
+pub type Ctxt = {
     ast: @ast::crate,
     ast_map: ast_map::map
 };
 
 type SrvOwner<T> = fn(srv: Srv) -> T;
-type CtxtHandler<T> = fn~(ctxt: Ctxt) -> T;
+pub type CtxtHandler<T> = fn~(ctxt: Ctxt) -> T;
 type Parser = fn~(Session, ~str) -> @ast::crate;
 
 enum Msg {
     HandleRequest(fn~(Ctxt)),
     Exit
 }
 
-enum Srv = {
+pub enum Srv = {
     ch: comm::Chan<Msg>
 };
 
-fn from_str<T>(source: ~str, owner: SrvOwner<T>) -> T {
+pub fn from_str<T>(source: ~str, owner: SrvOwner<T>) -> T {
     run(owner, source, parse::from_str_sess)
 }
 
-fn from_file<T>(file: ~str, owner: SrvOwner<T>) -> T {
+pub fn from_file<T>(file: ~str, owner: SrvOwner<T>) -> T {
     run(owner, file, |sess, f| parse::from_file_sess(sess, &Path(f)))
 }
 
@@ -88,7 +81,7 @@ fn act(po: comm::Port<Msg>, source: ~str, parse: Parser) {
     }
 }
 
-fn exec<T:Send>(
+pub fn exec<T:Send>(
     srv: Srv,
     +f: fn~(ctxt: Ctxt) -> T
 ) -> T {

branches/dist-snap/src/librustdoc/attr_parser.rs

@@ -9,11 +9,7 @@ use syntax::ast;
 use syntax::attr;
 use core::tuple;
 
-export CrateAttrs;
-export parse_crate, parse_desc;
-export parse_hidden;
-
-type CrateAttrs = {
+pub type CrateAttrs = {
     name: Option<~str>
 };
 
@@ -48,7 +44,7 @@ fn doc_metas(
     return doc_metas;
 }
 
-fn parse_crate(attrs: ~[ast::attribute]) -> CrateAttrs {
+pub fn parse_crate(attrs: ~[ast::attribute]) -> CrateAttrs {
     let link_metas = attr::find_linkage_metas(attrs);
 
     {
@@ -80,7 +76,7 @@ fn should_not_extract_crate_name_if_no_name_value_in_link_attribute() {
     assert attrs.name == None;
 }
 
-fn parse_desc(attrs: ~[ast::attribute]) -> Option<~str> {
+pub fn parse_desc(attrs: ~[ast::attribute]) -> Option<~str> {
     let doc_strs = do doc_metas(attrs).filter_map |meta| {
         attr::get_meta_item_value_str(*meta)
     };
@@ -107,7 +103,7 @@ fn parse_desc_should_parse_simple_doc_attributes() {
     assert attrs == Some(~"basic");
 }
 
-fn parse_hidden(attrs: ~[ast::attribute]) -> bool {
+pub fn parse_hidden(attrs: ~[ast::attribute]) -> bool {
     do doc_metas(attrs).find |meta| {
         match attr::get_meta_item_list(meta) {
           Some(metas) => {

branches/dist-snap/src/librustdoc/attr_pass.rs

@@ -12,9 +12,7 @@ use syntax::ast;
 use syntax::ast_map;
 use std::map::HashMap;
 
-export mk_pass;
-
-fn mk_pass() -> Pass {
+pub fn mk_pass() -> Pass {
     {
         name: ~"attr",
         f: run

branches/dist-snap/src/librustdoc/config.rs

@@ -1,21 +1,12 @@
 use result::Result;
 use std::getopts;
 
-export OutputFormat;
-export OutputStyle;
-export Config;
-export default_config;
-export parse_config;
-export usage;
-export Markdown, PandocHtml;
-export DocPerCrate, DocPerMod;
-
 /// The type of document to output
-enum OutputFormat {
+pub enum OutputFormat {
     /// Markdown
-    Markdown,
+    pub Markdown,
     /// HTML, via markdown and pandoc
-    PandocHtml
+    pub PandocHtml
 }
 
 impl OutputFormat : cmp::Eq {
@@ -36,11 +27,11 @@ impl OutputFormat : cmp::Eq {
 }
 
 /// How to organize the output
-enum OutputStyle {
+pub enum OutputStyle {
     /// All in a single document
-    DocPerCrate,
+    pub DocPerCrate,
     /// Each module in its own document
-    DocPerMod
+    pub DocPerMod
 }
 
 impl OutputStyle : cmp::Eq {
@@ -61,7 +52,7 @@ impl OutputStyle : cmp::Eq {
 }
 
 /// The configuration for a rustdoc session
-type Config = {
+pub type Config = {
     input_crate: Path,
     output_dir: Path,
     output_format: OutputFormat,
@@ -90,7 +81,7 @@ fn opts() -> ~[(getopts::Opt, ~str)] {
     ]
 }
 
-fn usage() {
+pub fn usage() {
     use io::println;
 
     println(~"Usage: rustdoc [options] <cratefile>\n");
@@ -101,7 +92,7 @@ fn usage() {
     println(~"");
 }
 
-fn default_config(input_crate: &Path) -> Config {
+pub fn default_config(input_crate: &Path) -> Config {
     {
         input_crate: *input_crate,
         output_dir: Path("."),

branches/dist-snap/src/librustdoc/desc_to_brief_pass.rs

@@ -7,9 +7,7 @@ is interpreted as the brief description.
 
 use doc::ItemUtils;
 
-export mk_pass;
-
-fn mk_pass() -> Pass {
+pub fn mk_pass() -> Pass {
     {
         name: ~"desc_to_brief",
         f: run