squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #5374 : z0w0/rust/rustdoc-explicit-self, r=z0w0

Browse source
This commit is contained in:
bors 2013-03-16 18:57:43 -07:00
commit f54adca7c9
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/markdown_pass.rs
View file

@ -734,8 +734,8 @@ fn should_write_trait_method_header() {
#[test] #[test]
fn should_write_trait_method_signature() { fn should_write_trait_method_signature() {
let markdown = test::render( let markdown = test::render(
~"trait i { fn a(); }"); ~"trait i { fn a(&self); }");
fail_unless!(str::contains(markdown, ~"\n fn a()")); fail_unless!(str::contains(markdown, ~"\n fn a(&self)"));
} }
fn write_impl(ctxt: &Ctxt, doc: doc::ImplDoc) { fn write_impl(ctxt: &Ctxt, doc: doc::ImplDoc) {
@ -773,8 +773,8 @@ fn should_write_impl_method_header() {
#[test] #[test]
fn should_write_impl_method_signature() { fn should_write_impl_method_signature() {
let markdown = test::render( let markdown = test::render(
~"impl int { fn a() { } }"); ~"impl int { fn a(&mut self) { } }");
fail_unless!(str::contains(markdown, ~"\n fn a()")); fail_unless!(str::contains(markdown, ~"\n fn a(&mut self)"));
} }
fn write_type( fn write_type(

13
src/librustdoc/tystr_pass.rs
View file

@ -75,7 +75,7 @@ fn get_fn_sig(srv: astsrv::Srv, fn_id: doc::AstId) -> Option<~str> {
ident: ident, ident: ident,
node: ast::foreign_item_fn(ref decl, _, ref tys), _ node: ast::foreign_item_fn(ref decl, _, ref tys), _
}, _, _) => { }, _, _) => {
Some(pprust::fun_to_str(decl, ident, tys, Some(pprust::fun_to_str(decl, ident, None, tys,
extract::interner())) extract::interner()))
} }
_ => fail!(~"get_fn_sig: fn_id not bound to a fn item") _ => fail!(~"get_fn_sig: fn_id not bound to a fn item")
@ -215,6 +215,7 @@ fn get_method_sig(
Some(pprust::fun_to_str( Some(pprust::fun_to_str(
&ty_m.decl, &ty_m.decl,
ty_m.ident, ty_m.ident,
Some(ty_m.self_ty.node),
&ty_m.generics, &ty_m.generics,
extract::interner() extract::interner()
)) ))
@ -223,6 +224,7 @@ fn get_method_sig(
Some(pprust::fun_to_str( Some(pprust::fun_to_str(
&m.decl, &m.decl,
m.ident, m.ident,
Some(m.self_ty.node),
&m.generics, &m.generics,
extract::interner() extract::interner()
)) ))
@ -242,6 +244,7 @@ fn get_method_sig(
Some(pprust::fun_to_str( Some(pprust::fun_to_str(
&method.decl, &method.decl,
method.ident, method.ident,
Some(method.self_ty.node),
&method.generics, &method.generics,
extract::interner() extract::interner()
)) ))
@ -256,9 +259,9 @@ fn get_method_sig(
#[test] #[test]
fn should_add_trait_method_sigs() { fn should_add_trait_method_sigs() {
let doc = test::mk_doc(~"trait i { fn a<T>() -> int; }"); let doc = test::mk_doc(~"trait i { fn a<T>(&mut self) -> int; }");
fail_unless!(doc.cratemod().traits()[0].methods[0].sig fail_unless!(doc.cratemod().traits()[0].methods[0].sig
== Some(~"fn a<T>() -> int")); == Some(~"fn a<T>(&mut self) -> int"));
} }
fn fold_impl( fn fold_impl(
@ -315,9 +318,9 @@ fn should_add_impl_self_ty() {
#[test] #[test]
fn should_add_impl_method_sigs() { fn should_add_impl_method_sigs() {
let doc = test::mk_doc(~"impl int { fn a<T>() -> int { fail!() } }"); let doc = test::mk_doc(~"impl int { fn a<T>(&self) -> int { fail!() } }");
fail_unless!(doc.cratemod().impls()[0].methods[0].sig fail_unless!(doc.cratemod().impls()[0].methods[0].sig
== Some(~"fn a<T>() -> int")); == Some(~"fn a<T>(&self) -> int"));
} }
fn fold_type( fn fold_type(

5
src/libsyntax/print/pprust.rs
View file

@ -181,10 +181,11 @@ pub fn path_to_str(&&p: @ast::path, intr: @ident_interner) -> ~str {
} }
pub fn fun_to_str(decl: &ast::fn_decl, name: ast::ident, 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 { generics: &ast::Generics, intr: @ident_interner) -> ~str {
do io::with_str_writer |wr| { do io::with_str_writer |wr| {
let s = rust_printer(wr, intr); let s = rust_printer(wr, intr);
print_fn(s, decl, None, name, generics, None, ast::inherited); print_fn(s, decl, None, name, generics, opt_self_ty, ast::inherited);
end(s); // Close the head box end(s); // Close the head box
end(s); // Close the outer box end(s); // Close the outer box
eof(s.s); eof(s.s);
@ -2274,7 +2275,7 @@ pub mod test {
cf: ast::return_val cf: ast::return_val
}; };
let generics = ast_util::empty_generics(); let generics = ast_util::empty_generics();
check_equal (&fun_to_str(&decl, abba_ident, &generics, mock_interner), check_equal (&fun_to_str(&decl, abba_ident, None, &generics, mock_interner),
&~"fn abba()"); &~"fn abba()");
} }