---

yaml
---
r: 53857
b: refs/heads/dist-snap
c: 4f23850
h: refs/heads/master
i:
  53855: 4a71387
v: v3

Author: z0w0

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 50d99e0194af2bc8da9867b2c5f1e4d44dd7baf2
+refs/heads/dist-snap: 4f238503d8730486fd9c72c71f1043a2f925299d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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, tys,
+            Some(pprust::fun_to_str(decl, ident, None, tys,
                                     extract::interner()))
           }
           _ => 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(
                           &ty_m.decl,
                           ty_m.ident,
+                          Some(ty_m.self_ty.node),
                           &ty_m.generics,
                           extract::interner()
                       ))
@@ -223,6 +224,7 @@ fn get_method_sig(
                       Some(pprust::fun_to_str(
                           &m.decl,
                           m.ident,
+                          Some(m.self_ty.node),
                           &m.generics,
                           extract::interner()
                       ))
@@ -242,6 +244,7 @@ fn get_method_sig(
                     Some(pprust::fun_to_str(
                         &method.decl,
                         method.ident,
+                        Some(method.self_ty.node),
                         &method.generics,
                         extract::interner()
                     ))

branches/dist-snap/src/libsyntax/parse/mod.rs

@@ -300,7 +300,7 @@ mod test {
     use core::str;
     use util::testing::*;
 
-    #[test] fn to_json_str (val: @Encodable<std::json::Encoder>) -> ~str {
+    #[test] fn to_json_str (val: Encodable<std::json::Encoder>) -> ~str {
         do io::with_str_writer |writer| {
             val.encode(~std::json::Encoder(writer));
         }

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

@@ -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,
+                  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, 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 outer box
         eof(s.s);