---

yaml
---
r: 73331
b: refs/heads/dist-snap
c: 6e50515
h: refs/heads/master
i:
  73329: a24ad84
  73327: bedf586
v: v3

Author: huonw

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: 70222b7e86da5a813f9bcf60d884389fc8b04ef7
+refs/heads/dist-snap: 6e5051553050974eb9362e1465cc2d40e2c9a610
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/rt/context.rs

@@ -183,7 +183,9 @@ fn new_regs() -> ~Registers { ~([0, .. 32]) }
 
 #[cfg(target_arch = "mips")]
 fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
-    let sp = mut_offset(sp, -1);
+    let sp = align_down(sp);
+    // sp of mips o32 is 8-byte aligned
+    let sp = mut_offset(sp, -2);
 
     // The final return address. 0 indicates the bottom of the stack
     unsafe { *sp = 0; }

branches/dist-snap/src/libcore/vec.rs

@@ -22,7 +22,7 @@ use old_iter;
 use iterator::Iterator;
 use kinds::Copy;
 use libc;
-use old_iter::{BaseIter, CopyableIter};
+use old_iter::CopyableIter;
 use option::{None, Option, Some};
 use ptr::to_unsafe_ptr;
 use ptr;

branches/dist-snap/src/libfuzzer/fuzzer.rc

@@ -38,7 +38,7 @@ pub enum test_mode { tm_converge, tm_run, }
 pub struct Context { mode: test_mode } // + rng
 
 pub fn write_file(filename: &Path, content: &str) {
-    result::get(&io::file_writer(filename, [io::Create, io::Truncate]))
+    result::get(&io::file_writer(filename, ~[io::Create, io::Truncate]))
                     .write_str(content);
 }
 
@@ -47,12 +47,12 @@ pub fn contains(haystack: &str, needle: &str) -> bool {
 }
 
 pub fn find_rust_files(files: &mut ~[Path], path: &Path) {
-    if path.filetype() == Some(~".rs") && !contains(path.to_str(), "utf8") {
+    if path.filetype() == Some(~".rs") && !contains(path.to_str(), ~"utf8") {
         // ignoring "utf8" tests because something is broken
         files.push(path.clone());
     } else if os::path_is_dir(path)
-        && !contains(path.to_str(), "compile-fail")
-        && !contains(path.to_str(), "build") {
+        && !contains(path.to_str(), ~"compile-fail")
+        && !contains(path.to_str(), ~"build") {
         for os::list_dir_path(path).each |p| {
             find_rust_files(&mut *files, *p);
         }
@@ -406,34 +406,34 @@ pub fn check_whole_compiler(code: &str,
 
 pub fn removeIfExists(filename: &Path) {
     // So sketchy!
-    assert!(!contains(filename.to_str(), " "));
-    run::program_output("bash", [~"-c", ~"rm " + filename.to_str()]);
+    assert!(!contains(filename.to_str(), ~" "));
+    run::program_output(~"bash", ~[~"-c", ~"rm " + filename.to_str()]);
 }
 
 pub fn removeDirIfExists(filename: &Path) {
     // So sketchy!
-    assert!(!contains(filename.to_str(), " "));
-    run::program_output("bash", [~"-c", ~"rm -r " + filename.to_str()]);
+    assert!(!contains(filename.to_str(), ~" "));
+    run::program_output(~"bash", ~[~"-c", ~"rm -r " + filename.to_str()]);
 }
 
 pub fn check_running(exe_filename: &Path) -> happiness {
     let p = run::program_output(
-        "/Users/jruderman/scripts/timed_run_rust_program.py",
-        [exe_filename.to_str()]);
+        ~"/Users/jruderman/scripts/timed_run_rust_program.py",
+        ~[exe_filename.to_str()]);
     let comb = p.out + ~"\n" + p.err;
     if str::len(comb) > 1u {
         error!("comb comb comb: %?", comb);
     }
 
-    if contains(comb, "Assertion failed:") {
+    if contains(comb, ~"Assertion failed:") {
         failed(~"C++ assertion failure")
-    } else if contains(comb, "leaked memory in rust main loop") {
+    } else if contains(comb, ~"leaked memory in rust main loop") {
         // might also use exit code 134
         //failed("Leaked")
         known_bug(~"https://github.com/mozilla/rust/issues/910")
-    } else if contains(comb, "src/rt/") {
+    } else if contains(comb, ~"src/rt/") {
         failed(~"Mentioned src/rt/")
-    } else if contains(comb, "malloc") {
+    } else if contains(comb, ~"malloc") {
         failed(~"Mentioned malloc")
     } else {
         match p.status {
@@ -457,26 +457,26 @@ pub fn check_running(exe_filename: &Path) -> happiness {
 
 pub fn check_compiling(filename: &Path) -> happiness {
     let p = run::program_output(
-        "/Users/jruderman/code/rust/build/x86_64-apple-darwin/\
+        ~"/Users/jruderman/code/rust/build/x86_64-apple-darwin/\
          stage1/bin/rustc",
-        [filename.to_str()]);
+        ~[filename.to_str()]);
 
     //error!("Status: %d", p.status);
     if p.status == 0 {
         passed
     } else if p.err != ~"" {
-        if contains(p.err, "error:") {
+        if contains(p.err, ~"error:") {
             cleanly_rejected(~"rejected with span_error")
         } else {
             error!("Stderr: %?", p.err);
             failed(~"Unfamiliar error message")
         }
-    } else if contains(p.out, "Assertion") && contains(p.out, "failed") {
+    } else if contains(p.out, ~"Assertion") && contains(p.out, ~"failed") {
         error!("Stdout: %?", p.out);
         failed(~"Looks like an llvm assertion failure")
-    } else if contains(p.out, "internal compiler error unimplemented") {
+    } else if contains(p.out, ~"internal compiler error unimplemented") {
         known_bug(~"Something unimplemented")
-    } else if contains(p.out, "internal compiler error") {
+    } else if contains(p.out, ~"internal compiler error") {
         error!("Stdout: %?", p.out);
         failed(~"internal compiler error")
 
@@ -603,8 +603,8 @@ pub fn check_roundtrip_convergence(code: @~str, maxIters: uint) {
         error!("Did not converge after %u iterations!", i);
         write_file(&Path("round-trip-a.rs"), *oldv);
         write_file(&Path("round-trip-b.rs"), *newv);
-        run::run_program("diff",
-                         [~"-w", ~"-u", ~"round-trip-a.rs",
+        run::run_program(~"diff",
+                         ~[~"-w", ~"-u", ~"round-trip-a.rs",
                           ~"round-trip-b.rs"]);
         fail!("Mismatch");
     }
@@ -635,7 +635,7 @@ pub fn check_variants(files: &[Path], cx: Context) {
         }
 
         let s = @result::get(&io::read_whole_file_str(file));
-        if contains(*s, "#") {
+        if contains(*s, ~"#") {
             loop; // Macros are confusing
         }
         if cx.mode == tm_converge && content_might_not_converge(*s) {

branches/dist-snap/src/librustc/front/test.rs

@@ -17,7 +17,7 @@ use syntax::ast_util::*;
 use syntax::attr;
 use syntax::codemap::{dummy_sp, span, ExpandedFrom, CallInfo, NameAndSpan};
 use syntax::codemap;
-use syntax::ext::base::{mk_ctxt, ext_ctxt};
+use syntax::ext::base::ExtCtxt;
 use syntax::fold;
 use syntax::print::pprust;
 use syntax::{ast, ast_util};
@@ -36,7 +36,7 @@ struct TestCtxt {
     sess: session::Session,
     crate: @ast::crate,
     path: ~[ast::ident],
-    ext_cx: @ext_ctxt,
+    ext_cx: @ExtCtxt,
     testfns: ~[Test]
 }
 
@@ -64,7 +64,7 @@ fn generate_test_harness(sess: session::Session,
     let cx: @mut TestCtxt = @mut TestCtxt {
         sess: sess,
         crate: crate,
-        ext_cx: mk_ctxt(sess.parse_sess, copy sess.opts.cfg),
+        ext_cx: ExtCtxt::new(sess.parse_sess, copy sess.opts.cfg),
         path: ~[],
         testfns: ~[]
     };

branches/dist-snap/src/librustc/middle/resolve.rs

@@ -1834,6 +1834,10 @@ pub impl Resolver {
                         debug!("(building import directive) bumping \
                                 reference");
                         resolution.outstanding_references += 1;
+
+                        // the source of this name is different now
+                        resolution.privacy = privacy;
+                        resolution.id = id;
                     }
                     None => {
                         debug!("(building import directive) creating new");

branches/dist-snap/src/librustdoc/attr_parser.rs

@@ -26,7 +26,7 @@ fn doc_metas(
     attrs: ~[ast::attribute]
 ) -> ~[@ast::meta_item] {
 
-    let doc_attrs = attr::find_attrs_by_name(attrs, "doc");
+    let doc_attrs = attr::find_attrs_by_name(attrs, ~"doc");
     let doc_metas = do doc_attrs.map |attr| {
         attr::attr_meta(attr::desugar_doc_attr(attr))
     };
@@ -36,7 +36,7 @@ fn doc_metas(
 
 pub fn parse_crate(attrs: ~[ast::attribute]) -> CrateAttrs {
     let link_metas = attr::find_linkage_metas(attrs);
-    let name = attr::last_meta_item_value_str_by_name(link_metas, "name");
+    let name = attr::last_meta_item_value_str_by_name(link_metas, ~"name");
 
     CrateAttrs {
         name: name.map(|s| copy **s)
@@ -58,7 +58,7 @@ pub fn parse_hidden(attrs: ~[ast::attribute]) -> bool {
     do doc_metas(attrs).find |meta| {
         match attr::get_meta_item_list(*meta) {
             Some(metas) => {
-                let hiddens = attr::find_meta_items_by_name(metas, "hidden");
+                let hiddens = attr::find_meta_items_by_name(metas, ~"hidden");
                 !hiddens.is_empty()
             }
             None => false

branches/dist-snap/src/librustdoc/config.rs

@@ -70,12 +70,12 @@ fn opts() -> ~[(getopts::Opt, ~str)] {
 pub fn usage() {
     use core::io::println;
 
-    println("Usage: rustdoc [options] <cratefile>\n");
-    println("Options:\n");
+    println(~"Usage: rustdoc [options] <cratefile>\n");
+    println(~"Options:\n");
     for opts().each |opt| {
         println(fmt!("    %s", opt.second()));
     }
-    println("");
+    println(~"");
 }
 
 pub fn default_config(input_crate: &Path) -> Config {
@@ -227,7 +227,7 @@ pub fn maybe_find_pandoc(
     };
 
     let pandoc = do vec::find(possible_pandocs) |pandoc| {
-        let output = program_output(*pandoc, [~"--version"]);
+        let output = program_output(*pandoc, ~[~"--version"]);
         debug!("testing pandoc cmd %s: %?", *pandoc, output);
         output.status == 0
     };

branches/dist-snap/src/librustdoc/desc_to_brief_pass.rs

@@ -104,7 +104,7 @@ fn first_sentence(s: ~str) -> Option<~str> {
     let paras = paragraphs(s);
     if !paras.is_empty() {
         let first_para = paras.head();
-        Some(str::replace(first_sentence_(*first_para), "\n", " "))
+        Some(str::replace(first_sentence_(*first_para), ~"\n", ~" "))
     } else {
         None
     }
@@ -132,7 +132,7 @@ fn first_sentence_(s: &str) -> ~str {
             str::to_owned(str::slice(s, 0, idx - 1))
         }
         _ => {
-            if str::ends_with(s, ".") {
+            if str::ends_with(s, ~".") {
                 str::to_owned(s)
             } else {
                 str::to_owned(s)

branches/dist-snap/src/librustdoc/escape_pass.rs

@@ -20,7 +20,7 @@ pub fn mk_pass() -> Pass {
 }
 
 fn escape(s: &str) -> ~str {
-    str::replace(s, "\\", "\\\\")
+    str::replace(s, ~"\\", ~"\\\\")
 }
 
 #[test]

branches/dist-snap/src/librustdoc/markdown_index_pass.rs

@@ -124,33 +124,33 @@ pub fn pandoc_header_id(header: &str) -> ~str {
     return header;
 
     fn remove_formatting(s: &str) -> ~str {
-        str::replace(s, "`", "")
+        str::replace(s, ~"`", ~"")
     }
     fn remove_punctuation(s: &str) -> ~str {
-        let s = str::replace(s, "<", "");
-        let s = str::replace(s, ">", "");
-        let s = str::replace(s, "[", "");
-        let s = str::replace(s, "]", "");
-        let s = str::replace(s, "(", "");
-        let s = str::replace(s, ")", "");
-        let s = str::replace(s, "@~", "");
-        let s = str::replace(s, "~", "");
-        let s = str::replace(s, "/", "");
-        let s = str::replace(s, ":", "");
-        let s = str::replace(s, "&", "");
-        let s = str::replace(s, "^", "");
-        let s = str::replace(s, ",", "");
-        let s = str::replace(s, "'", "");
-        let s = str::replace(s, "+", "");
+        let s = str::replace(s, ~"<", ~"");
+        let s = str::replace(s, ~">", ~"");
+        let s = str::replace(s, ~"[", ~"");
+        let s = str::replace(s, ~"]", ~"");
+        let s = str::replace(s, ~"(", ~"");
+        let s = str::replace(s, ~")", ~"");
+        let s = str::replace(s, ~"@~", ~"");
+        let s = str::replace(s, ~"~", ~"");
+        let s = str::replace(s, ~"/", ~"");
+        let s = str::replace(s, ~":", ~"");
+        let s = str::replace(s, ~"&", ~"");
+        let s = str::replace(s, ~"^", ~"");
+        let s = str::replace(s, ~",", ~"");
+        let s = str::replace(s, ~"'", ~"");
+        let s = str::replace(s, ~"+", ~"");
         return s;
     }
     fn replace_with_hyphens(s: &str) -> ~str {
         // Collapse sequences of whitespace to a single dash
         // XXX: Hacky implementation here that only covers
         // one or two spaces.
         let s = str::trim(s);
-        let s = str::replace(s, "  ", "-");
-        let s = str::replace(s, " ", "-");
+        let s = str::replace(s, ~"  ", ~"-");
+        let s = str::replace(s, ~" ", ~"-");
         return s;
     }
     // FIXME: #4318 Instead of to_ascii and to_str_ascii, could use

branches/dist-snap/src/librustdoc/markdown_pass.rs

@@ -110,7 +110,7 @@ fn make_title(page: doc::Page) -> ~str {
         }
     };
     let title = markdown_pass::header_text(item);
-    let title = str::replace(title, "`", "");
+    let title = str::replace(title, ~"`", ~"");
     return title;
 }
 
@@ -169,7 +169,7 @@ pub fn header_kind(doc: doc::ItemTag) -> ~str {
 }
 
 pub fn header_name(doc: doc::ItemTag) -> ~str {
-    let fullpath = str::connect(doc.path() + ~[doc.name()], "::");
+    let fullpath = str::connect(doc.path() + ~[doc.name()], ~"::");
     match &doc {
         &doc::ModTag(_) if doc.id() != syntax::ast::crate_node_id => {
             fullpath
@@ -471,7 +471,7 @@ fn write_methods(ctxt: &Ctxt, docs: &[doc::MethodDoc]) {
 }
 
 fn write_method(ctxt: &Ctxt, doc: doc::MethodDoc) {
-    write_header_(ctxt, H3, header_text_("Method", doc.name));
+    write_header_(ctxt, H3, header_text_(~"Method", doc.name));
     write_fnlike(
         ctxt,
         copy doc.sig,

branches/dist-snap/src/librustdoc/markdown_writer.rs

@@ -101,7 +101,7 @@ fn pandoc_writer(
         use core::io::WriterUtil;
 
         debug!("pandoc cmd: %s", pandoc_cmd);
-        debug!("pandoc args: %s", str::connect(pandoc_args, " "));
+        debug!("pandoc args: %s", str::connect(pandoc_args, ~" "));
 
         let pipe_in = os::pipe();
         let pipe_out = os::pipe();
@@ -198,7 +198,7 @@ pub fn make_filename(
             }
           }
           doc::ItemPage(doc) => {
-            str::connect(doc.path() + ~[doc.name()], "_")
+            str::connect(doc.path() + ~[doc.name()], ~"_")
           }
         }
     };
@@ -213,7 +213,7 @@ pub fn make_filename(
 fn write_file(path: &Path, s: ~str) {
     use core::io::WriterUtil;
 
-    match io::file_writer(path, [io::Create, io::Truncate]) {
+    match io::file_writer(path, ~[io::Create, io::Truncate]) {
       result::Ok(writer) => {
         writer.write_str(s);
       }

branches/dist-snap/src/librustdoc/sectionalize_pass.rs

@@ -149,7 +149,7 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
 }
 
 fn parse_header(line: ~str) -> Option<~str> {
-    if str::starts_with(line, "# ") {
+    if str::starts_with(line, ~"# ") {
         Some(str::slice(line, 2u, str::len(line)).to_owned())
     } else {
         None

branches/dist-snap/src/librustdoc/unindent_pass.rs

@@ -82,7 +82,7 @@ fn unindent(s: &str) -> ~str {
                 str::slice(*line, min_indent, str::len(*line)).to_owned()
             }
         };
-        str::connect(unindented, "\n")
+        str::connect(unindented, ~"\n")
     } else {
         s.to_str()
     }