rustdoc: Remove legacy exports

Author: brson

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 {

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) => {

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

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("."),

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

src/librustdoc/doc.rs

@@ -1,8 +1,8 @@
 //! The document model
 
-type AstId = int;
+pub type AstId = int;
 
-type Doc_ = {
+pub type Doc_ = {
     pages: ~[Page]
 };
 
@@ -23,7 +23,7 @@ impl Doc_ : cmp::Eq {
     pure fn ne(&self, other: &Doc_) -> bool { !(*self).eq(other) }
 }
 
-enum Doc {
+pub enum Doc {
     Doc_(Doc_)
 }
 
@@ -40,7 +40,7 @@ impl Doc : cmp::Eq {
     pure fn ne(&self, other: &Doc) -> bool { *(*self) != *(*other) }
 }
 
-enum Page {
+pub enum Page {
     CratePage(CrateDoc),
     ItemPage(ItemTag)
 }
@@ -88,7 +88,7 @@ impl Page : cmp::Eq {
     pure fn ne(&self, other: &Page) -> bool { !(*self).eq(other) }
 }
 
-enum Implementation {
+pub enum Implementation {
     Required,
     Provided,
 }
@@ -115,7 +115,7 @@ impl Implementation : cmp::Eq {
  * Most rustdocs can be parsed into 'sections' according to their markdown
  * headers
  */
-type Section = {
+pub type Section = {
     header: ~str,
     body: ~str
 };
@@ -140,7 +140,7 @@ impl Section : cmp::Eq {
 // FIXME (#2596): We currently give topmod the name of the crate.  There
 // would probably be fewer special cases if the crate had its own name
 // and topmod's name was the empty string.
-type CrateDoc = {
+pub type CrateDoc = {
     topmod: ModDoc,
 };
 
@@ -161,7 +161,7 @@ impl CrateDoc : cmp::Eq {
     pure fn ne(&self, other: &CrateDoc) -> bool { !(*self).eq(other) }
 }
 
-enum ItemTag {
+pub enum ItemTag {
     ModTag(ModDoc),
     NmodTag(NmodDoc),
     ConstTag(ConstDoc),
@@ -300,7 +300,7 @@ impl ItemTag : cmp::Eq {
     pure fn ne(&self, other: &ItemTag) -> bool { !(*self).eq(other) }
 }
 
-type ItemDoc = {
+pub type ItemDoc = {
     id: AstId,
     name: ~str,
     path: ~[~str],
@@ -340,7 +340,7 @@ impl ItemDoc : cmp::Eq {
     pure fn ne(&self, other: &ItemDoc) -> bool { !(*self).eq(other) }
 }
 
-type SimpleItemDoc = {
+pub type SimpleItemDoc = {
     item: ItemDoc,
     sig: Option<~str>
 };
@@ -362,7 +362,7 @@ impl SimpleItemDoc : cmp::Eq {
     pure fn ne(&self, other: &SimpleItemDoc) -> bool { !(*self).eq(other) }
 }
 
-type ModDoc_ = {
+pub type ModDoc_ = {
     item: ItemDoc,
     items: ~[ItemTag],
     index: Option<Index>
@@ -389,7 +389,7 @@ impl ModDoc_ : cmp::Eq {
     pure fn ne(&self, other: &ModDoc_) -> bool { !(*self).eq(other) }
 }
 
-enum ModDoc {
+pub enum ModDoc {
     ModDoc_(ModDoc_)
 }
 
@@ -406,7 +406,7 @@ impl ModDoc : cmp::Eq {
     pure fn ne(&self, other: &ModDoc) -> bool { *(*self) != *(*other) }
 }
 
-type NmodDoc = {
+pub type NmodDoc = {
     item: ItemDoc,
     fns: ~[FnDoc],
     index: Option<Index>
@@ -433,11 +433,11 @@ impl NmodDoc : cmp::Eq {
     pure fn ne(&self, other: &NmodDoc) -> bool { !(*self).eq(other) }
 }
 
-type ConstDoc = SimpleItemDoc;
+pub type ConstDoc = SimpleItemDoc;
 
-type FnDoc = SimpleItemDoc;
+pub type FnDoc = SimpleItemDoc;
 
-type EnumDoc = {
+pub type EnumDoc = {
     item: ItemDoc,
     variants: ~[VariantDoc]
 };
@@ -459,7 +459,7 @@ impl EnumDoc : cmp::Eq {
     pure fn ne(&self, other: &EnumDoc) -> bool { !(*self).eq(other) }
 }
 
-type VariantDoc = {
+pub type VariantDoc = {
     name: ~str,
     desc: Option<~str>,
     sig: Option<~str>
@@ -486,7 +486,7 @@ impl VariantDoc : cmp::Eq {
     pure fn ne(&self, other: &VariantDoc) -> bool { !(*self).eq(other) }
 }
 
-type TraitDoc = {
+pub type TraitDoc = {
     item: ItemDoc,
     methods: ~[MethodDoc]
 };
@@ -508,7 +508,7 @@ impl TraitDoc : cmp::Eq {
     pure fn ne(&self, other: &TraitDoc) -> bool { !(*self).eq(other) }
 }
 
-type MethodDoc = {
+pub type MethodDoc = {
     name: ~str,
     brief: Option<~str>,
     desc: Option<~str>,
@@ -544,7 +544,7 @@ impl MethodDoc : cmp::Eq {
     pure fn ne(&self, other: &MethodDoc) -> bool { !(*self).eq(other) }
 }
 
-type ImplDoc = {
+pub type ImplDoc = {
     item: ItemDoc,
     trait_types: ~[~str],
     self_ty: Option<~str>,
@@ -574,9 +574,9 @@ impl ImplDoc : cmp::Eq {
     pure fn ne(&self, other: &ImplDoc) -> bool { !(*self).eq(other) }
 }
 
-type TyDoc = SimpleItemDoc;
+pub type TyDoc = SimpleItemDoc;
 
-type StructDoc = {
+pub type StructDoc = {
     item: ItemDoc,
     fields: ~[~str],
     sig: Option<~str>
@@ -603,7 +603,7 @@ impl StructDoc : cmp::Eq {
     pure fn ne(&self, other: &StructDoc) -> bool { !(*self).eq(other) }
 }
 
-type Index = {
+pub type Index = {
     entries: ~[IndexEntry]
 };
 
@@ -634,7 +634,7 @@ impl Index : cmp::Eq {
  * * brief - The brief description
  * * link - A format-specific string representing the link target
  */
-type IndexEntry = {
+pub type IndexEntry = {
     kind: ~str,
     name: ~str,
     brief: Option<~str>,
@@ -764,7 +764,7 @@ impl ModDoc {
     }
 }
 
-trait PageUtils {
+pub trait PageUtils {
     fn mods() -> ~[ModDoc];
     fn nmods() -> ~[NmodDoc];
     fn fns() -> ~[FnDoc];
@@ -850,7 +850,7 @@ impl ~[Page]: PageUtils {
     }
 }
 
-trait Item {
+pub trait Item {
     pure fn item() -> ItemDoc;
 }
 
@@ -898,7 +898,7 @@ impl StructDoc: Item {
     pure fn item() -> ItemDoc { self.item }
 }
 
-trait ItemUtils {
+pub trait ItemUtils {
     pure fn id() -> AstId;
     pure fn name() -> ~str;
     pure fn path() -> ~[~str];