---

yaml
---
r: 97843
b: refs/heads/snap-stage3
c: 0e6455e
h: refs/heads/master
i:
  97841: 50c88f2
  97839: aa942a8
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: aeb541674cb97fdd68eacfda7309a06b39db7a83
+refs/heads/snap-stage3: 0e6455e2b8ee707c0683c67ba224b7682aff4e85
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/c_vec.rs

@@ -160,21 +160,19 @@ impl <T> Container for CVec<T> {
 
 #[cfg(test)]
 mod tests {
-
     use super::*;
 
     use std::libc::*;
     use std::libc;
     use std::ptr;
+    use std::rt::global_heap::malloc_raw;
 
     fn malloc(n: uint) -> CVec<u8> {
         unsafe {
-            let mem = libc::malloc(n as size_t);
-
-            assert!(mem as int != 0);
+            let mem = malloc_raw(n);
 
             CVec::new_with_dtor(mem as *mut u8, n,
-                proc() { libc::free(mem); })
+                proc() { libc::free(mem as *c_void); })
         }
     }
 

branches/snap-stage3/src/libnative/io/file.rs

@@ -13,7 +13,7 @@
 use std::c_str::CString;
 use std::io::IoError;
 use std::io;
-use std::libc::c_int;
+use std::libc::{c_int, c_void};
 use std::libc;
 use std::os;
 use std::rt::rtio;
@@ -548,7 +548,7 @@ pub fn readdir(p: &CString) -> IoResult<~[Path]> {
             let p = Path::new(p);
             let star = p.join("*");
             as_utf16_p(star.as_str().unwrap(), |path_ptr| {
-                let wfd_ptr = malloc_raw(rust_list_dir_wfd_size() as uint);
+                let wfd_ptr = malloc_raw(rust_list_dir_wfd_size() as uint) as *c_void;
                 let find_handle = FindFirstFileW(path_ptr, wfd_ptr as HANDLE);
                 if find_handle as libc::c_int != INVALID_HANDLE_VALUE {
                     let mut paths = ~[];

branches/snap-stage3/src/librustc/back/archive.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -133,12 +133,12 @@ impl Archive {
         run_ar(self.sess, "d", None, [&self.dst, &Path::new(file)]);
     }
 
-    /// Update all symbols in the archive (runs 'ar s' over it)
+    /// Updates all symbols in the archive (runs 'ar s' over it)
     pub fn update_symbols(&mut self) {
         run_ar(self.sess, "s", None, [&self.dst]);
     }
 
-    /// List all files in an archive
+    /// Lists all files in an archive
     pub fn files(&self) -> ~[~str] {
         let output = run_ar(self.sess, "t", None, [&self.dst]);
         str::from_utf8(output.output).lines().map(|s| s.to_owned()).collect()
@@ -182,7 +182,7 @@ impl Archive {
         let (osprefix, osext) = match self.sess.targ_cfg.os {
             abi::OsWin32 => ("", "lib"), _ => ("lib", "a"),
         };
-        // On windows, static libraries sometimes show up as libfoo.a and other
+        // On Windows, static libraries sometimes show up as libfoo.a and other
         // times show up as foo.lib
         let oslibname = format!("{}{}.{}", osprefix, name, osext);
         let unixlibname = format!("lib{}.a", name);
@@ -228,7 +228,7 @@ impl ArchiveRO {
         }
     }
 
-    /// Read a file in the archive
+    /// Reads a file in the archive
     pub fn read<'a>(&'a self, file: &str) -> Option<&'a [u8]> {
         unsafe {
             let mut size = 0 as libc::size_t;

branches/snap-stage3/src/librustc/back/link.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -183,7 +183,7 @@ pub mod write {
             llvm::LLVMDisposePassManager(mpm);
 
             // Emit the bytecode if we're either saving our temporaries or
-            // emitting an rlib. Whenever an rlib is create, the bytecode is
+            // emitting an rlib. Whenever an rlib is created, the bytecode is
             // inserted into the archive in order to allow LTO against it.
             let outputs = sess.outputs.borrow();
             if sess.opts.save_temps ||
@@ -314,7 +314,7 @@ pub mod write {
         use std::unstable::mutex::{Once, ONCE_INIT};
         static mut INIT: Once = ONCE_INIT;
 
-        // Copy what clan does by turning on loop vectorization at O2 and
+        // Copy what clang does by turning on loop vectorization at O2 and
         // slp vectorization at O3
         let vectorize_loop = !sess.no_vectorize_loops() &&
                              (sess.opts.optimize == session::Default ||
@@ -347,7 +347,7 @@ pub mod write {
             // Only initialize the platforms supported by Rust here, because
             // using --llvm-root will have multiple platforms that rustllvm
             // doesn't actually link to and it's pointless to put target info
-            // into the registry that Rust can not generate machine code for.
+            // into the registry that Rust cannot generate machine code for.
             llvm::LLVMInitializeX86TargetInfo();
             llvm::LLVMInitializeX86Target();
             llvm::LLVMInitializeX86TargetMC();
@@ -381,7 +381,7 @@ pub mod write {
         let builder = llvm::LLVMPassManagerBuilderCreate();
         match opt {
             lib::llvm::CodeGenLevelNone => {
-                // Don't add lifetime intrinsics add O0
+                // Don't add lifetime intrinsics at O0
                 llvm::LLVMRustAddAlwaysInlinePass(builder, false);
             }
             lib::llvm::CodeGenLevelLess => {
@@ -591,7 +591,7 @@ pub fn mangle(sess: Session, ss: ast_map::Path,
     //
     // It turns out that on OSX you can actually have arbitrary symbols in
     // function names (at least when given to LLVM), but this is not possible
-    // when using unix's linker. Perhaps one day when we just a linker from LLVM
+    // when using unix's linker. Perhaps one day when we just use a linker from LLVM
     // we won't need to do this name mangling. The problem with name mangling is
     // that it seriously limits the available characters. For example we can't
     // have things like @T or ~[T] in symbol names when one would theoretically
@@ -894,7 +894,7 @@ fn link_rlib(sess: Session,
     //   determine the architecture of the archive in order to see whether its
     //   linkable.
     //
-    //   The algorithm for this detections is: iterate over the files in the
+    //   The algorithm for this detection is: iterate over the files in the
     //   archive. Skip magical SYMDEF names. Interpret the first file as an
     //   object file. Read architecture from the object file.
     //
@@ -941,7 +941,7 @@ fn link_rlib(sess: Session,
 // Create a static archive
 //
 // This is essentially the same thing as an rlib, but it also involves adding
-// all of the upstream crates' objects into the the archive. This will slurp in
+// all of the upstream crates' objects into the archive. This will slurp in
 // all of the native libraries of upstream dependencies as well.
 //
 // Additionally, there's no way for us to link dynamic libraries, so we warn
@@ -1058,7 +1058,7 @@ fn link_args(sess: Session,
     if sess.targ_cfg.os == abi::OsLinux {
         // GNU-style linkers will use this to omit linking to libraries which
         // don't actually fulfill any relocations, but only for libraries which
-        // follow this flag. Thus, use it before specifing libraries to link to.
+        // follow this flag. Thus, use it before specifying libraries to link to.
         args.push(~"-Wl,--as-needed");
 
         // GNU-style linkers support optimization with -O. --gc-sections
@@ -1074,7 +1074,7 @@ fn link_args(sess: Session,
     if sess.targ_cfg.os == abi::OsWin32 {
         // Make sure that we link to the dynamic libgcc, otherwise cross-module
         // DWARF stack unwinding will not work.
-        // This behavior may be overriden by --link-args "-static-libgcc"
+        // This behavior may be overridden by --link-args "-static-libgcc"
         args.push(~"-shared-libgcc");
     }
 
@@ -1124,7 +1124,7 @@ fn link_args(sess: Session,
 
 // # Native library linking
 //
-// User-supplied library search paths (-L on the cammand line) These are
+// User-supplied library search paths (-L on the command line). These are
 // the same paths used to find Rust crates, so some of them may have been
 // added already by the previous crate linking code. This only allows them
 // to be found at compile time so it is still entirely up to outside
@@ -1182,12 +1182,12 @@ fn add_upstream_rust_crates(args: &mut ~[~str], sess: Session,
     if !dylib && !sess.prefer_dynamic() {
         // With an executable, things get a little interesting. As a limitation
         // of the current implementation, we require that everything must be
-        // static, or everything must be dynamic. The reasons for this are a
+        // static or everything must be dynamic. The reasons for this are a
         // little subtle, but as with the above two cases, the goal is to
         // prevent duplicate copies of the same library showing up. For example,
         // a static immediate dependency might show up as an upstream dynamic
         // dependency and we currently have no way of knowing that. We know that
-        // all dynamic libaries require dynamic dependencies (see above), so
+        // all dynamic libraries require dynamic dependencies (see above), so
         // it's satisfactory to include either all static libraries or all
         // dynamic libraries.
         let crates = cstore.get_used_crates(cstore::RequireStatic);
@@ -1232,7 +1232,7 @@ fn add_upstream_rust_crates(args: &mut ~[~str], sess: Session,
     }
 
     // If we're performing LTO, then it should have been previously required
-    // that all upstream rust depenencies were available in an rlib format.
+    // that all upstream rust dependencies were available in an rlib format.
     assert!(!sess.lto());
 
     // This is a fallback of three different  cases of linking:

branches/snap-stage3/src/librustc/metadata/encoder.rs

@@ -496,9 +496,8 @@ fn encode_reexported_static_methods(ecx: &EncodeContext,
                                     ebml_w: &mut writer::Encoder,
                                     mod_path: &[ast_map::PathElem],
                                     exp: &middle::resolve::Export2) {
-    let items = ecx.tcx.items.borrow();
-    match items.get().find(&exp.def_id.node) {
-        Some(&ast_map::NodeItem(item, path)) => {
+    match ecx.tcx.items.find(exp.def_id.node) {
+        Some(ast_map::NodeItem(item, path)) => {
             let original_name = ecx.tcx.sess.str_of(item.ident);
 
             //
@@ -1196,6 +1195,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
         encode_trait_ref(ebml_w, ecx, trait_def.trait_ref, tag_item_trait_ref);
         encode_name(ecx, ebml_w, item.ident);
         encode_attributes(ebml_w, item.attrs);
+        encode_visibility(ebml_w, vis);
         for &method_def_id in ty::trait_method_def_ids(tcx, def_id).iter() {
             ebml_w.start_tag(tag_item_trait_method);
             encode_def_id(ebml_w, method_def_id);
@@ -1347,8 +1347,7 @@ fn my_visit_item(i: &Item,
                  ebml_w: &mut writer::Encoder,
                  ecx_ptr: *int,
                  index: @RefCell<~[entry<i64>]>) {
-    let items = items.borrow();
-    match items.get().get_copy(&i.id) {
+    match items.get(i.id) {
         ast_map::NodeItem(_, pt) => {
             let mut ebml_w = unsafe {
                 ebml_w.unsafe_clone()
@@ -1366,8 +1365,7 @@ fn my_visit_foreign_item(ni: &ForeignItem,
                          ebml_w: &mut writer::Encoder,
                          ecx_ptr:*int,
                          index: @RefCell<~[entry<i64>]>) {
-    let items = items.borrow();
-    match items.get().get_copy(&ni.id) {
+    match items.get(ni.id) {
         ast_map::NodeForeignItem(_, abi, _, pt) => {
             debug!("writing foreign item {}::{}",
                    ast_map::path_to_str(

branches/snap-stage3/src/librustc/middle/borrowck/mod.rs

@@ -550,9 +550,8 @@ impl BorrowckCtxt {
             move_data::Declared => {}
 
             move_data::MoveExpr => {
-                let items = self.tcx.items.borrow();
-                let (expr_ty, expr_span) = match items.get().find(&move.id) {
-                    Some(&ast_map::NodeExpr(expr)) => {
+                let (expr_ty, expr_span) = match self.tcx.items.find(move.id) {
+                    Some(ast_map::NodeExpr(expr)) => {
                         (ty::expr_ty_adjusted(self.tcx, expr), expr.span)
                     }
                     r => self.tcx.sess.bug(format!("MoveExpr({:?}) maps to {:?}, not Expr",
@@ -578,9 +577,8 @@ impl BorrowckCtxt {
             }
 
             move_data::Captured => {
-                let items = self.tcx.items.borrow();
-                let (expr_ty, expr_span) = match items.get().find(&move.id) {
-                    Some(&ast_map::NodeExpr(expr)) => {
+                let (expr_ty, expr_span) = match self.tcx.items.find(move.id) {
+                    Some(ast_map::NodeExpr(expr)) => {
                         (ty::expr_ty_adjusted(self.tcx, expr), expr.span)
                     }
                     r => self.tcx.sess.bug(format!("Captured({:?}) maps to {:?}, not Expr",
@@ -768,9 +766,8 @@ impl BorrowckCtxt {
                                    out: &mut ~str) {
         match *loan_path {
             LpVar(id) => {
-                let items = self.tcx.items.borrow();
-                match items.get().find(&id) {
-                    Some(&ast_map::NodeLocal(ref ident, _)) => {
+                match self.tcx.items.find(id) {
+                    Some(ast_map::NodeLocal(ref ident, _)) => {
                         out.push_str(token::ident_to_str(ident));
                     }
                     r => {

branches/snap-stage3/src/librustc/middle/check_const.rs

@@ -250,8 +250,7 @@ impl<'a> Visitor<()> for CheckItemRecursionVisitor<'a> {
                 match def_map.get().find(&e.id) {
                     Some(&DefStatic(def_id, _)) if
                             ast_util::is_local(def_id) => {
-                        let ast_map = self.ast_map.borrow();
-                        match ast_map.get().get_copy(&def_id.node) {
+                        match self.ast_map.get(def_id.node) {
                             ast_map::NodeItem(it, _) => {
                                 self.visit_item(it, ());
                             }

branches/snap-stage3/src/librustc/middle/const_eval.rs

@@ -108,10 +108,9 @@ pub fn lookup_variant_by_id(tcx: ty::ctxt,
 
     if ast_util::is_local(enum_def) {
         {
-            let items = tcx.items.borrow();
-            match items.get().find(&enum_def.node) {
+            match tcx.items.find(enum_def.node) {
                 None => None,
-                Some(&ast_map::NodeItem(it, _)) => match it.node {
+                Some(ast_map::NodeItem(it, _)) => match it.node {
                     ItemEnum(ast::EnumDef { variants: ref variants }, _) => {
                         variant_expr(*variants, variant_def.node)
                     }
@@ -161,10 +160,9 @@ pub fn lookup_const_by_id(tcx: ty::ctxt, def_id: ast::DefId)
                           -> Option<@Expr> {
     if ast_util::is_local(def_id) {
         {
-            let items = tcx.items.borrow();
-            match items.get().find(&def_id.node) {
+            match tcx.items.find(def_id.node) {
                 None => None,
-                Some(&ast_map::NodeItem(it, _)) => match it.node {
+                Some(ast_map::NodeItem(it, _)) => match it.node {
                     ItemStatic(_, ast::MutImmutable, const_expr) => {
                         Some(const_expr)
                     }

branches/snap-stage3/src/librustc/middle/dead.rs

@@ -38,12 +38,11 @@ fn should_explore(tcx: ty::ctxt, def_id: ast::DefId) -> bool {
         return false;
     }
 
-    let items = tcx.items.borrow();
-    match items.get().find(&def_id.node) {
-        Some(&ast_map::NodeItem(..))
-        | Some(&ast_map::NodeMethod(..))
-        | Some(&ast_map::NodeForeignItem(..))
-        | Some(&ast_map::NodeTraitMethod(..)) => true,
+    match tcx.items.find(def_id.node) {
+        Some(ast_map::NodeItem(..))
+        | Some(ast_map::NodeMethod(..))
+        | Some(ast_map::NodeForeignItem(..))
+        | Some(ast_map::NodeTraitMethod(..)) => true,
         _ => false
     }
 }
@@ -136,9 +135,8 @@ impl MarkSymbolVisitor {
             }
             scanned.insert(id);
 
-            let items = self.tcx.items.borrow();
-            match items.get().find(&id) {
-                Some(node) => {
+            match self.tcx.items.find(id) {
+                Some(ref node) => {
                     self.live_symbols.insert(id);
                     self.visit_node(node);
                 }

branches/snap-stage3/src/librustc/middle/entry.rs

@@ -75,9 +75,8 @@ fn find_item(item: &Item, ctxt: &mut EntryContext) {
         ItemFn(..) => {
             if item.ident.name == special_idents::main.name {
                 {
-                    let ast_map = ctxt.ast_map.borrow();
-                    match ast_map.get().find(&item.id) {
-                        Some(&ast_map::NodeItem(_, path)) => {
+                    match ctxt.ast_map.find(item.id) {
+                        Some(ast_map::NodeItem(_, path)) => {
                             if path.len() == 0 {
                                 // This is a top-level function so can be 'main'
                                 if ctxt.main_fn.is_none() {

branches/snap-stage3/src/librustc/middle/lint.rs

@@ -1330,8 +1330,7 @@ fn check_stability(cx: &Context, e: &ast::Expr) {
 
     let stability = if ast_util::is_local(id) {
         // this crate
-        let items = cx.tcx.items.borrow();
-        match items.get().find(&id.node) {
+        match cx.tcx.items.find(id.node) {
             Some(ast_node) => {
                 let s = ast_node.with_attrs(|attrs| {
                     attrs.map(|a| {