---

yaml
---
r: 60541
b: refs/heads/auto
c: 975f264
h: refs/heads/master
i:
  60539: 3ea8cb1
v: v3

Author: jbclements

[refs]

@@ -14,6 +14,6 @@ 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: 15f97acdc87087e7747900be83d038757b86fb25
+refs/heads/auto: 975f2649839c945660339b8929a04432b1562635
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/vec.rs

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

branches/auto/src/librustc/middle/resolve.rs

@@ -1818,10 +1818,6 @@ 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/auto/src/libstd/fileinput.rs

@@ -210,9 +210,7 @@ impl FileInput {
     pub fn next_file(&self) -> bool {
         // No more files
 
-        // unsafe block can be removed after the next snapshot
-        // (next one after 2013-05-03)
-        if unsafe { self.fi.files.is_empty() } {
+        if self.fi.files.is_empty() {
             self.fi.current_reader = None;
             return false;
         }
@@ -324,9 +322,7 @@ impl io::Reader for FileInput {
     fn eof(&self) -> bool {
         // we've run out of files, and current_reader is either None or eof.
 
-        // unsafe block can be removed after the next snapshot
-        // (next one after 2013-05-03)
-        (unsafe { self.fi.files.is_empty() }) &&
+        self.fi.files.is_empty() &&
             match self.fi.current_reader { None => true, Some(r) => r.eof() }
 
     }

branches/auto/src/libsyntax/parse/mod.rs

@@ -357,65 +357,18 @@ mod test {
     use abi;
     use ast_util::mk_ident;
     use parse::parser::Parser;
-    use parse::token::{ident_interner, mk_fresh_ident_interner};
-    use diagnostic::{mk_span_handler, mk_handler};
-
-    // add known names to interner for testing
-    fn mk_testing_interner() -> @ident_interner {
-        let i = mk_fresh_ident_interner();
-        // baby hack; in order to put the identifiers
-        // 'a' and 'b' at known locations, we're going
-        // to fill up the interner to length 100. If
-        // the # of preloaded items on the interner
-        // ever gets larger than 100, we'll have to
-        // adjust this number (say, to 200) and
-        // change the numbers in the identifier
-        // test cases below.
-
-        assert!(i.len() < 100);
-        for int::range(0,100-((i.len()).to_int())) |_dc| {
-            i.gensym("dontcare");
-        }
-        i.intern("a");
-        i.intern("b");
-        i.intern("c");
-        i.intern("d");
-        i.intern("return");
-        assert_eq!(i.get(ast::ident{repr:101,ctxt:0}), @~"b");
-        i
-    }
-
-    // make a parse_sess that's closed over a
-    // testing interner (where a -> 100, b -> 101)
-    fn mk_testing_parse_sess() -> @mut ParseSess {
-        let interner = mk_testing_interner();
-        let cm = @CodeMap::new();
-        @mut ParseSess {
-            cm: cm,
-            next_id: 1,
-            span_diagnostic: mk_span_handler(mk_handler(None), cm),
-            interner: interner,
-        }
-    }
-
-    // map a string to tts, using a made-up filename: return both the token_trees
-    // and the ParseSess
-    fn string_to_tts_t (source_str : @~str) -> (~[ast::token_tree],@mut ParseSess) {
-        let ps = mk_testing_parse_sess();
-        (filemap_to_tts(ps,string_to_filemap(ps,source_str,~"bogofile")),ps)
-    }
+    use parse::token::{ident_interner, mk_ident_interner, mk_fresh_ident_interner};
+    use diagnostic::{span_handler, mk_span_handler, mk_handler, Emitter};
+    use util::parser_testing::{string_to_tts_and_sess,string_to_parser};
+    use util::parser_testing::{string_to_crate, string_to_expr, string_to_item};
+    use util::parser_testing::{string_to_stmt};
 
     // map a string to tts, return the tt without its parsesess
     fn string_to_tts_only(source_str : @~str) -> ~[ast::token_tree] {
-        let (tts,_ps) = string_to_tts_t(source_str);
+        let (tts,_ps) = string_to_tts_and_sess(source_str);
         tts
     }
 
-    // map string to parser (via tts)
-    fn string_to_parser(source_str: @~str) -> Parser {
-        let ps = mk_testing_parse_sess();
-        new_parser_from_source_str(ps,~[],~"bogofile",source_str)
-    }
 
     #[cfg(test)] fn to_json_str<E : Encodable<std::json::Encoder>>(val: @E) -> ~str {
         do io::with_str_writer |writer| {
@@ -424,22 +377,6 @@ mod test {
         }
     }
 
-    fn string_to_crate (source_str : @~str) -> @ast::crate {
-        string_to_parser(source_str).parse_crate_mod()
-    }
-
-    fn string_to_expr (source_str : @~str) -> @ast::expr {
-        string_to_parser(source_str).parse_expr()
-    }
-
-    fn string_to_item (source_str : @~str) -> Option<@ast::item> {
-        string_to_parser(source_str).parse_item(~[])
-    }
-
-    fn string_to_stmt (source_str : @~str) -> @ast::stmt {
-        string_to_parser(source_str).parse_stmt(~[])
-    }
-
     // produce a codemap::span
     fn sp (a: uint, b: uint) -> span {
         span{lo:BytePos(a),hi:BytePos(b),expn_info:None}
@@ -482,7 +419,7 @@ mod test {
     }*/
 
     #[test] fn string_to_tts_1 () {
-        let (tts,_ps) = string_to_tts_t(@~"fn a (b : int) { b; }");
+        let (tts,_ps) = string_to_tts_and_sess(@~"fn a (b : int) { b; }");
         assert_eq!(to_json_str(@tts),
                    ~"[\
                 [\"tt_tok\",null,[\"IDENT\",\"fn\",false]],\

branches/auto/src/libsyntax/syntax.rc

@@ -30,6 +30,8 @@ extern mod std;
 #[macro_escape]
 pub mod util {
     pub mod interner;
+    #[cfg(test)]
+    pub mod parser_testing;
 }
 
 pub mod syntax {

branches/auto/src/libsyntax/util/parser_testing.rs

@@ -0,0 +1,96 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::serialize::Encodable;
+use std;
+use core::io;
+use core::option::{Option,None};
+use core::int;
+use core::num::NumCast;
+use codemap::{dummy_sp, CodeMap, BytePos, spanned};
+use opt_vec;
+use ast;
+use abi;
+use ast_util::mk_ident;
+use parse::parser::Parser;
+use parse::token::{ident_interner, mk_ident_interner, mk_fresh_ident_interner};
+use diagnostic::{span_handler, mk_span_handler, mk_handler, Emitter};
+
+use syntax::parse::{ParseSess,new_parse_sess,string_to_filemap,filemap_to_tts};
+use syntax::parse::{new_parser_from_source_str};
+
+// add known names to interner for testing
+fn mk_testing_interner() -> @ident_interner {
+    let i = mk_fresh_ident_interner();
+    // baby hack; in order to put the identifiers
+    // 'a' and 'b' at known locations, we're going
+    // to fill up the interner to length 100. If
+    // the # of preloaded items on the interner
+    // ever gets larger than 100, we'll have to
+    // adjust this number (say, to 200) and
+    // change the numbers in the identifier
+    // test cases below.
+
+    assert!(i.len() < 100);
+    for int::range(0,100-((i.len()).to_int())) |_dc| {
+        i.gensym(~"dontcare");
+    }
+    i.intern("a");
+    i.intern("b");
+    i.intern("c");
+    i.intern("d");
+    i.intern("return");
+    assert!(i.get(ast::ident{repr:101,ctxt:0}) == @~"b");
+    i
+}
+
+// make a parse_sess that's closed over a
+// testing interner (where a -> 100, b -> 101)
+fn mk_testing_parse_sess() -> @mut ParseSess {
+    let interner = mk_testing_interner();
+    let cm = @CodeMap::new();
+    @mut ParseSess {
+        cm: cm,
+        next_id: 1,
+        span_diagnostic: mk_span_handler(mk_handler(None), cm),
+        interner: interner,
+    }
+}
+
+// map a string to tts, using a made-up filename: return both the token_trees
+// and the ParseSess
+pub fn string_to_tts_and_sess (source_str : @~str) -> (~[ast::token_tree],@mut ParseSess) {
+    let ps = mk_testing_parse_sess();
+    (filemap_to_tts(ps,string_to_filemap(ps,source_str,~"bogofile")),ps)
+}
+
+// map string to parser (via tts)
+pub fn string_to_parser(source_str: @~str) -> Parser {
+    let ps = mk_testing_parse_sess();
+    new_parser_from_source_str(ps,~[],~"bogofile",source_str)
+}
+
+pub fn string_to_crate (source_str : @~str) -> @ast::crate {
+    string_to_parser(source_str).parse_crate_mod()
+}
+
+// parse a string, return an expr
+pub fn string_to_expr (source_str : @~str) -> @ast::expr {
+    string_to_parser(source_str).parse_expr()
+}
+
+pub fn string_to_item (source_str : @~str) -> Option<@ast::item> {
+    string_to_parser(source_str).parse_item(~[])
+}
+
+pub fn string_to_stmt (source_str : @~str) -> @ast::stmt {
+    string_to_parser(source_str).parse_stmt(~[])
+}
+