---

yaml
---
r: 50683
b: refs/heads/try
c: 1c8490b
h: refs/heads/master
i:
  50681: 1a6f120
  50679: 005aa3f
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: 387aa3668a4ff865c5554a9f3dac2d339f8ef7aa
+refs/heads/try: 1c8490b0d9efa58d9e0ed0949c3f74ed9a3dc703
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/astencode.rs

@@ -1203,8 +1203,8 @@ impl fake_ext_ctxt for fake_session {
 }
 
 #[cfg(test)]
-fn mk_ctxt() -> fake_ext_ctxt {
-    @parse::new_parse_sess(None) as fake_ext_ctxt
+fn mk_ctxt() -> @fake_ext_ctxt {
+    @parse::new_parse_sess(None) as @fake_ext_ctxt
 }
 
 #[cfg(test)]

branches/try/src/librustdoc/rustdoc.rc

@@ -116,7 +116,8 @@ fn run(config: Config) {
             // Remove things marked doc(hidden)
             prune_hidden_pass::mk_pass(),
             // Remove things that are private
-            prune_private_pass::mk_pass(),
+            // XXX enable this after 'export' is removed in favor of 'pub'
+            // prune_private_pass::mk_pass(),
             // Extract brief documentation from the full descriptions
             desc_to_brief_pass::mk_pass(),
             // Massage the text to remove extra indentation

branches/try/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));
         }