---

yaml
---
r: 39607
b: refs/heads/incoming
c: 84ce55e
h: refs/heads/master
i:
  39605: b175579
  39603: db5c655
  39599: 6a87a7f
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: c880d0ab7688af2cf5ed547019c22e10d81f7cb4
+refs/heads/incoming: 84ce55e5427d0d36dbf6e330537175ab4162b6f2
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/back/rpath.rs

@@ -114,7 +114,10 @@ fn get_rpaths_relative_to_output(os: session::os,
 
 fn get_rpath_relative_to_output(os: session::os,
                                 output: &Path,
-                                lib: &Path) -> Path {
+                                lib: &Path)
+                             -> Path {
+    use core::os;
+
     assert not_win32(os);
 
     // Mac doesn't appear to support $ORIGIN
@@ -197,6 +200,12 @@ fn minimize_rpaths(rpaths: &[Path]) -> ~[Path] {
 #[cfg(unix)]
 mod test {
     #[legacy_exports];
+
+    use driver::session;
+
+    use core::os;
+    use core::str;
+
     #[test]
     fn test_rpaths_to_flags() {
         let flags = rpaths_to_flags(~[Path("path1"),

branches/incoming/src/librustc/driver/driver.rs

@@ -828,6 +828,11 @@ fn list_metadata(sess: Session, path: &Path, out: io::Writer) {
 mod test {
     #[legacy_exports];
 
+    use core::vec;
+    use std::getopts;
+    use syntax::attr;
+    use syntax::diagnostic;
+
     // When the user supplies --test we should implicitly supply --cfg test
     #[test]
     fn test_switch_implies_cfg_test() {

branches/incoming/src/librustc/driver/session.rs

@@ -332,6 +332,7 @@ fn sess_os_to_meta_os(os: os) -> metadata::loader::os {
 #[cfg(test)]
 mod test {
     #[legacy_exports];
+    use syntax::ast;
     use syntax::ast_util;
 
     fn make_crate_type_attr(t: ~str) -> ast::attribute {

branches/incoming/src/librustc/front/test.rs

@@ -238,7 +238,7 @@ fn nospan<T: Copy>(t: T) -> ast::spanned<T> {
 }
 
 fn path_node(ids: ~[ast::ident]) -> @ast::path {
-    @{span: dummy_sp(), global: false, idents: ids, rp: None, types: ~[]}
+    @{span: dummy_sp(), global: true, idents: ids, rp: None, types: ~[]}
 }
 
 fn mk_tests(cx: test_ctxt) -> @ast::item {

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

@@ -23,12 +23,13 @@ use middle::{ty, typeck};
 use middle;
 use util::ppaux::ty_to_str;
 
-use core::{dvec, option, vec};
+use core::{dvec, io, option, vec};
 use std::ebml::reader::get_doc;
 use std::ebml::reader;
 use std::ebml::writer::Encoder;
 use std::ebml;
 use std::map::HashMap;
+use std::prettyprint;
 use std::serialize;
 use std::serialize::{Encodable, EncoderHelpers, DecoderHelpers};
 use std::serialize::Decodable;
@@ -1071,10 +1072,10 @@ fn roundtrip(in_item: Option<@ast::item>) {
     let out_item = decode_item_ast(ebml_doc);
 
     let exp_str = do io::with_str_writer |w| {
-        in_item.encode(&std::prettyprint::Encoder(w))
+        in_item.encode(&prettyprint::Serializer(w))
     };
     let out_str = do io::with_str_writer |w| {
-        out_item.encode(&std::prettyprint::Encoder(w))
+        out_item.encode(&prettyprint::Serializer(w))
     };
 
     debug!("expected string: %s", exp_str);