---

yaml
---
r: 49931
b: refs/heads/auto
c: 1c8490b
h: refs/heads/master
i:
  49929: 0c730cc
  49927: 6498d65
v: v3

Author: pcwalton

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 387aa3668a4ff865c5554a9f3dac2d339f8ef7aa
+refs/heads/auto: 1c8490b0d9efa58d9e0ed0949c3f74ed9a3dc703
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

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