---

yaml
---
r: 64196
b: refs/heads/snap-stage3
c: e6e4f52
h: refs/heads/master
v: v3

Author: bcully

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 495741498cadf0bcf75e9d21fd5dc83d6b471eb6
+refs/heads/snap-stage3: e6e4f52bcf67e78bc0c796cd780fa01791923fdb
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -59,7 +59,6 @@ use middle::trans::type_of::*;
 use middle::ty;
 use util::common::indenter;
 use util::ppaux::{Repr, ty_to_str};
-use middle::pat_util;
 
 use middle::trans::type_::Type;
 

branches/snap-stage3/src/librustc/middle/trans/callee.rs

@@ -20,7 +20,6 @@ use std::vec;
 
 use back::abi;
 use driver::session;
-use lib;
 use lib::llvm::ValueRef;
 use lib::llvm::llvm;
 use metadata::csearch;

branches/snap-stage3/src/librustc/middle/trans/context.rs

@@ -29,7 +29,6 @@ use std::hash;
 use std::hashmap::{HashMap, HashSet};
 use std::str;
 use std::local_data;
-use extra::time;
 use syntax::ast;
 
 use middle::trans::common::{mono_id,ExternMap,tydesc_info,BuilderRef_res,Stats};

branches/snap-stage3/src/librustc/middle/trans/datum.rs

@@ -100,7 +100,6 @@ use middle::trans::glue;
 use middle::trans::tvec;
 use middle::trans::type_of;
 use middle::trans::write_guard;
-use middle::trans::type_::Type;
 use middle::ty;
 use util::common::indenter;
 use util::ppaux::ty_to_str;

branches/snap-stage3/src/librustc/middle/trans/glue.rs

@@ -39,7 +39,6 @@ use middle::trans::type_::Type;
 use std::io;
 use std::libc::c_uint;
 use std::str;
-use extra::time;
 use syntax::ast;
 
 pub fn trans_free(cx: block, v: ValueRef) -> block {

branches/snap-stage3/src/librustc/middle/trans/uniq.rs

@@ -19,7 +19,6 @@ use middle::trans::glue;
 use middle::ty;
 use middle::trans::machine::llsize_of;
 use middle::trans::type_of;
-use middle::trans::type_of::*;
 
 pub fn make_free_glue(bcx: block, vptrptr: ValueRef, box_ty: ty::t)
     -> block {

branches/snap-stage3/src/libstd/libc.rs

@@ -186,13 +186,6 @@ pub mod types {
     // Standard types that are opaque or common, so are not per-target.
     pub mod common {
         pub mod c95 {
-            /**
-            Type used to construct void pointers for use with C.
-
-            This type is only useful as a pointer target. Do not use it as a
-            return type for FFI functions which have the `void` return type in
-            C. Use the unit type `()` or omit the return type instead.
-            */
             pub enum c_void {}
             pub enum FILE {}
             pub enum fpos_t {}

branches/snap-stage3/src/libstd/vec.rs

@@ -26,7 +26,9 @@ use option::{None, Option, Some};
 use ptr::to_unsafe_ptr;
 use ptr;
 use ptr::RawPtr;
-use rt::global_heap::{malloc_raw, realloc_raw};
+#[cfg(not(stage0))]
+use rt::global_heap::malloc_raw;
+use rt::global_heap::realloc_raw;
 use sys;
 use sys::size_of;
 use uint;