Skip to content

Commit

Permalink
Change const to static
Browse files Browse the repository at this point in the history
  • Loading branch information
@sammykim @emberian
sammykim authored and emberian committed Aug 8, 2013
1 parent 19d0eb9 commit a9b7bec
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 43 deletions.
16 changes: 8 additions & 8 deletions src/librustdoc/doc.rs
View file
Expand Up @@ -54,7 +54,7 @@ pub struct CrateDoc {
pub enum ItemTag {
ModTag(ModDoc),
NmodTag(NmodDoc),
ConstTag(ConstDoc),
StaticTag(StaticDoc),
FnTag(FnDoc),
EnumTag(EnumDoc),
TraitTag(TraitDoc),
Expand Down Expand Up @@ -95,7 +95,7 @@ pub struct NmodDoc {
index: Option<Index>
}

pub type ConstDoc = SimpleItemDoc;
pub type StaticDoc = SimpleItemDoc;

pub type FnDoc = SimpleItemDoc;

Expand Down Expand Up @@ -214,8 +214,8 @@ impl ModDoc {
md!(FnTag)
}

pub fn consts(&self) -> ~[ConstDoc] {
md!(ConstTag)
pub fn statics(&self) -> ~[StaticDoc] {
md!(StaticTag)
}

pub fn enums(&self) -> ~[EnumDoc] {
Expand Down Expand Up @@ -249,7 +249,7 @@ pub trait PageUtils {
fn mods(&self) -> ~[ModDoc];
fn nmods(&self) -> ~[NmodDoc];
fn fns(&self) -> ~[FnDoc];
fn consts(&self) -> ~[ConstDoc];
fn statics(&self) -> ~[StaticDoc];
fn enums(&self) -> ~[EnumDoc];
fn traits(&self) -> ~[TraitDoc];
fn impls(&self) -> ~[ImplDoc];
Expand All @@ -270,8 +270,8 @@ impl PageUtils for ~[Page] {
pu!(FnTag)
}

fn consts(&self) -> ~[ConstDoc] {
pu!(ConstTag)
fn statics(&self) -> ~[StaticDoc] {
pu!(StaticTag)
}

fn enums(&self) -> ~[EnumDoc] {
Expand Down Expand Up @@ -301,7 +301,7 @@ impl Item for ItemTag {
&doc::ModTag(ref doc) => doc.item.clone(),
&doc::NmodTag(ref doc) => doc.item.clone(),
&doc::FnTag(ref doc) => doc.item.clone(),
&doc::ConstTag(ref doc) => doc.item.clone(),
&doc::StaticTag(ref doc) => doc.item.clone(),
&doc::EnumTag(ref doc) => doc.item.clone(),
&doc::TraitTag(ref doc) => doc.item.clone(),
&doc::ImplTag(ref doc) => doc.item.clone(),
Expand Down
12 changes: 6 additions & 6 deletions src/librustdoc/extract.rs
View file
Expand Up @@ -101,8 +101,8 @@ fn moddoc_from_mod(
))
}
ast::item_static(*) => {
Some(doc::ConstTag(
constdoc_from_const(ItemDoc)
Some(doc::StaticTag(
staticdoc_from_static(ItemDoc)
))
}
ast::item_enum(enum_definition, _) => {
Expand Down Expand Up @@ -165,7 +165,7 @@ fn fndoc_from_fn(itemdoc: doc::ItemDoc) -> doc::FnDoc {
}
}

fn constdoc_from_const(itemdoc: doc::ItemDoc) -> doc::ConstDoc {
fn staticdoc_from_static(itemdoc: doc::ItemDoc) -> doc::StaticDoc {
doc::SimpleItemDoc {
item: itemdoc,
sig: None
Expand Down Expand Up @@ -356,10 +356,10 @@ mod test {
}

#[test]
fn should_extract_const_name_and_id() {
fn should_extract_static_name_and_id() {
let doc = mk_doc(@"static a: int = 0;");
assert!(doc.cratemod().consts()[0].id() != 0);
assert!(doc.cratemod().consts()[0].name_() == ~"a");
assert!(doc.cratemod().statics()[0].id() != 0);
assert!(doc.cratemod().statics()[0].name_() == ~"a");
}

#[test]
Expand Down
28 changes: 14 additions & 14 deletions src/librustdoc/fold.rs
View file
Expand Up @@ -21,7 +21,7 @@ pub struct Fold<T> {
fold_mod: FoldMod<T>,
fold_nmod: FoldNmod<T>,
fold_fn: FoldFn<T>,
fold_const: FoldConst<T>,
fold_static: FoldStatic<T>,
fold_enum: FoldEnum<T>,
fold_trait: FoldTrait<T>,
fold_impl: FoldImpl<T>,
Expand All @@ -39,7 +39,7 @@ impl<T:Clone> Clone for Fold<T> {
fold_mod: self.fold_mod,
fold_nmod: self.fold_nmod,
fold_fn: self.fold_fn,
fold_const: self.fold_const,
fold_static: self.fold_static,
fold_enum: self.fold_enum,
fold_trait: self.fold_trait,
fold_impl: self.fold_impl,
Expand All @@ -55,7 +55,7 @@ type FoldItem<T> = @fn(fold: &Fold<T>, doc: doc::ItemDoc) -> doc::ItemDoc;
type FoldMod<T> = @fn(fold: &Fold<T>, doc: doc::ModDoc) -> doc::ModDoc;
type FoldNmod<T> = @fn(fold: &Fold<T>, doc: doc::NmodDoc) -> doc::NmodDoc;
type FoldFn<T> = @fn(fold: &Fold<T>, doc: doc::FnDoc) -> doc::FnDoc;
type FoldConst<T> = @fn(fold: &Fold<T>, doc: doc::ConstDoc) -> doc::ConstDoc;
type FoldStatic<T> = @fn(fold: &Fold<T>, doc: doc::StaticDoc) -> doc::StaticDoc;
type FoldEnum<T> = @fn(fold: &Fold<T>, doc: doc::EnumDoc) -> doc::EnumDoc;
type FoldTrait<T> = @fn(fold: &Fold<T>, doc: doc::TraitDoc) -> doc::TraitDoc;
type FoldImpl<T> = @fn(fold: &Fold<T>, doc: doc::ImplDoc) -> doc::ImplDoc;
Expand All @@ -73,7 +73,7 @@ fn mk_fold<T>(
fold_mod: FoldMod<T>,
fold_nmod: FoldNmod<T>,
fold_fn: FoldFn<T>,
fold_const: FoldConst<T>,
fold_static: FoldStatic<T>,
fold_enum: FoldEnum<T>,
fold_trait: FoldTrait<T>,
fold_impl: FoldImpl<T>,
Expand All @@ -88,7 +88,7 @@ fn mk_fold<T>(
fold_mod: fold_mod,
fold_nmod: fold_nmod,
fold_fn: fold_fn,
fold_const: fold_const,
fold_static: fold_static,
fold_enum: fold_enum,
fold_trait: fold_trait,
fold_impl: fold_impl,
Expand All @@ -106,7 +106,7 @@ pub fn default_any_fold<T:Clone>(ctxt: T) -> Fold<T> {
|f, d| default_any_fold_mod(f, d),
|f, d| default_any_fold_nmod(f, d),
|f, d| default_seq_fold_fn(f, d),
|f, d| default_seq_fold_const(f, d),
|f, d| default_seq_fold_static(f, d),
|f, d| default_seq_fold_enum(f, d),
|f, d| default_seq_fold_trait(f, d),
|f, d| default_seq_fold_impl(f, d),
Expand All @@ -124,7 +124,7 @@ pub fn default_seq_fold<T:Clone>(ctxt: T) -> Fold<T> {
|f, d| default_seq_fold_mod(f, d),
|f, d| default_seq_fold_nmod(f, d),
|f, d| default_seq_fold_fn(f, d),
|f, d| default_seq_fold_const(f, d),
|f, d| default_seq_fold_static(f, d),
|f, d| default_seq_fold_enum(f, d),
|f, d| default_seq_fold_trait(f, d),
|f, d| default_seq_fold_impl(f, d),
Expand All @@ -142,7 +142,7 @@ pub fn default_par_fold<T:Clone>(ctxt: T) -> Fold<T> {
|f, d| default_par_fold_mod(f, d),
|f, d| default_par_fold_nmod(f, d),
|f, d| default_seq_fold_fn(f, d),
|f, d| default_seq_fold_const(f, d),
|f, d| default_seq_fold_static(f, d),
|f, d| default_seq_fold_enum(f, d),
|f, d| default_seq_fold_trait(f, d),
|f, d| default_seq_fold_impl(f, d),
Expand Down Expand Up @@ -272,8 +272,8 @@ pub fn fold_ItemTag<T>(fold: &Fold<T>, doc: doc::ItemTag) -> doc::ItemTag {
doc::FnTag(FnDoc) => {
doc::FnTag((fold.fold_fn)(fold, FnDoc))
}
doc::ConstTag(ConstDoc) => {
doc::ConstTag((fold.fold_const)(fold, ConstDoc))
doc::StaticTag(StaticDoc) => {
doc::StaticTag((fold.fold_static)(fold, StaticDoc))
}
doc::EnumTag(EnumDoc) => {
doc::EnumTag((fold.fold_enum)(fold, EnumDoc))
Expand Down Expand Up @@ -303,10 +303,10 @@ pub fn default_seq_fold_fn<T>(
}
}

pub fn default_seq_fold_const<T>(
pub fn default_seq_fold_static<T>(
fold: &Fold<T>,
doc: doc::ConstDoc
) -> doc::ConstDoc {
doc: doc::StaticDoc
) -> doc::StaticDoc {
doc::SimpleItemDoc {
item: (fold.fold_item)(fold, doc.item.clone()),
.. doc
Expand Down Expand Up @@ -374,7 +374,7 @@ fn default_fold_should_produce_same_doc() {
}

#[test]
fn default_fold_should_produce_same_consts() {
fn default_fold_should_produce_same_statics() {
let source = @"static a: int = 0;";
let ast = parse::from_str(source);
let doc = extract::extract(ast, ~"");
Expand Down
10 changes: 5 additions & 5 deletions src/librustdoc/markdown_pass.rs
View file
Expand Up @@ -321,7 +321,7 @@ fn write_item_(ctxt: &Ctxt, doc: doc::ItemTag, write_header: bool) {
doc::ModTag(ModDoc) => write_mod(ctxt, ModDoc),
doc::NmodTag(nModDoc) => write_nmod(ctxt, nModDoc),
doc::FnTag(FnDoc) => write_fn(ctxt, FnDoc),
doc::ConstTag(ConstDoc) => write_const(ctxt, ConstDoc),
doc::StaticTag(StaticDoc) => write_static(ctxt, StaticDoc),
doc::EnumTag(EnumDoc) => write_enum(ctxt, EnumDoc),
doc::TraitTag(TraitDoc) => write_trait(ctxt, TraitDoc),
doc::ImplTag(ImplDoc) => write_impl(ctxt, ImplDoc),
Expand Down Expand Up @@ -409,9 +409,9 @@ fn code_block(s: ~str) -> ~str {
~~~", s)
}

fn write_const(
fn write_static(
ctxt: &Ctxt,
doc: doc::ConstDoc
doc: doc::StaticDoc
) {
write_sig(ctxt, doc.sig.clone());
write_common(ctxt, doc.desc(), doc.sections());
Expand Down Expand Up @@ -775,13 +775,13 @@ mod test {
}

#[test]
fn should_write_const_header() {
fn should_write_static_header() {
let markdown = render(~"static a: bool = true;");
assert!(markdown.contains("## Static `a`\n\n"));
}

#[test]
fn should_write_const_description() {
fn should_write_static_description() {
let markdown = render(
~"#[doc = \"b\"]\
static a: bool = true;");
Expand Down
6 changes: 3 additions & 3 deletions src/librustdoc/sort_item_type_pass.rs
View file
Expand Up @@ -18,7 +18,7 @@ pub fn mk_pass() -> Pass {
fn by_score(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
fn score(item: &doc::ItemTag) -> int {
match *item {
doc::ConstTag(_) => 0,
doc::StaticTag(_) => 0,
doc::TyTag(_) => 1,
doc::EnumTag(_) => 2,
doc::StructTag(_) => 3,
Expand All @@ -43,7 +43,7 @@ fn test() {

let source =
~"mod imod { } \
static iconst: int = 0; \
static istatic: int = 0; \
fn ifn() { } \
enum ienum { ivar } \
trait itrait { fn a(); } \
Expand All @@ -54,7 +54,7 @@ fn test() {
let doc = extract::from_srv(srv.clone(), ~"");
let doc = (mk_pass().f)(srv.clone(), doc);
// hidden __std_macros module at the start.
assert_eq!(doc.cratemod().items[0].name_(), ~"iconst");
assert_eq!(doc.cratemod().items[0].name_(), ~"istatic");
assert_eq!(doc.cratemod().items[1].name_(), ~"itype");
assert_eq!(doc.cratemod().items[2].name_(), ~"ienum");
assert_eq!(doc.cratemod().items[3].name_(), ~"istruct");
Expand Down
14 changes: 7 additions & 7 deletions src/librustdoc/tystr_pass.rs
View file
Expand Up @@ -39,7 +39,7 @@ pub fn run(
let fold = Fold {
ctxt: srv.clone(),
fold_fn: fold_fn,
fold_const: fold_const,
fold_static: fold_static,
fold_enum: fold_enum,
fold_trait: fold_trait,
fold_impl: fold_impl,
Expand Down Expand Up @@ -93,10 +93,10 @@ fn get_fn_sig(srv: astsrv::Srv, fn_id: doc::AstId) -> Option<~str> {
}
}

fn fold_const(
fn fold_static(
fold: &fold::Fold<astsrv::Srv>,
doc: doc::ConstDoc
) -> doc::ConstDoc {
doc: doc::StaticDoc
) -> doc::StaticDoc {
let srv = fold.ctxt.clone();

doc::SimpleItemDoc {
Expand All @@ -109,7 +109,7 @@ fn fold_const(
}, _) => {
pprust::ty_to_str(ty, extract::interner())
}
_ => fail!("fold_const: id not bound to a const item")
_ => fail!("fold_static: id not bound to a static item")
}
}}),
.. doc
Expand Down Expand Up @@ -384,9 +384,9 @@ mod test {
}

#[test]
fn should_add_const_types() {
fn should_add_static_types() {
let doc = mk_doc(~"static a: bool = true;");
assert!(doc.cratemod().consts()[0].sig == Some(~"bool"));
assert!(doc.cratemod().statics()[0].sig == Some(~"bool"));
}

#[test]
Expand Down

0 comments on commit a9b7bec

Please sign in to comment.