---

yaml
---
r: 50670
b: refs/heads/try
c: 3cee676
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: e4f5866c10cd5b45a4f95590f0f2fe0aff54c12e
+refs/heads/try: 3cee6763d1acc14b8e46117766730ca3a07dbf6b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/tidy.py

@@ -5,7 +5,7 @@
 from licenseck import *
 
 err=0
-cols=78
+cols=100
 
 # Be careful to support Python 2.4, 2.6, and 3.x here!
 config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],

branches/try/src/libcore/at_vec.rs

@@ -13,7 +13,6 @@
 use cast::transmute;
 use kinds::Copy;
 use iter;
-use libc;
 use option::Option;
 use ptr::addr_of;
 use sys;

branches/try/src/libcore/core.rc

@@ -56,7 +56,6 @@ Implicitly, all crates behave as if they included the following prologue:
 
 // On Linux, link to the runtime with -lrt.
 #[cfg(target_os = "linux")]
-#[doc(hidden)]
 pub mod linkhack {
     #[link_args="-lrustrt -lrt"]
     #[link_args = "-lpthread"]
@@ -253,7 +252,7 @@ pub mod rt;
 // A curious inner-module that's not exported that contains the binding
 // 'core' so that macro-expanded references to core::error and such
 // can be resolved within libcore.
-#[doc(hidden)]
+#[doc(hidden)] // FIXME #3538
 pub mod core {
     #[cfg(stage0)]
     pub const error : u32 = 1_u32;

branches/try/src/libcore/num/cmath.rs

@@ -10,10 +10,6 @@
 
 #[doc(hidden)]; // FIXME #3538
 
-use libc::c_int;
-use libc::c_float;
-use libc::c_double;
-
 // function names are almost identical to C's libmath, a few have been
 // renamed, grep for "rename:"
 

branches/try/src/libcore/vec.rs

@@ -19,7 +19,6 @@ use iter::BaseIter;
 use iter;
 use kinds::Copy;
 use libc;
-use libc::size_t;
 use option::{None, Option, Some};
 use unstable::intrinsics;
 use ptr;
@@ -76,9 +75,9 @@ pub fn reserve<T>(v: &mut ~[T], n: uint) {
             let td = sys::get_type_desc::<T>();
             if ((**ptr).box_header.ref_count ==
                 managed::raw::RC_MANAGED_UNIQUE) {
-                rustrt::vec_reserve_shared_actual(td, ptr, n as size_t);
+                rustrt::vec_reserve_shared_actual(td, ptr, n as libc::size_t);
             } else {
-                rustrt::vec_reserve_shared(td, ptr, n as size_t);
+                rustrt::vec_reserve_shared(td, ptr, n as libc::size_t);
             }
         }
     }
@@ -2071,7 +2070,6 @@ pub mod raw {
     use kinds::Copy;
     use managed;
     use option::{None, Some};
-    use option;
     use unstable::intrinsics;
     use ptr::addr_of;
     use ptr;

branches/try/src/librustc/middle/trans/controlflow.rs

@@ -30,7 +30,6 @@ use syntax::ast::ident;
 use syntax::ast_map::path_mod;
 use syntax::ast_util;
 use syntax::codemap::span;
-use syntax::print::pprust::expr_to_str;
 
 pub fn trans_block(bcx: block, b: &ast::blk, dest: expr::Dest) -> block {
     let _icx = bcx.insn_ctxt("trans_block");

branches/try/src/librustc/middle/typeck/check/mod.rs

@@ -1706,7 +1706,6 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
         let expr_t = structurally_resolved_type(fcx, expr.span,
                                                 fcx.expr_ty(base));
         let (base_t, derefs) = do_autoderef(fcx, expr.span, expr_t);
-        let n_tys = tys.len();
 
         match structure_of(fcx, expr.span, base_t) {
             ty::ty_struct(base_id, ref substs) => {

branches/try/src/libstd/test.rs

@@ -26,7 +26,6 @@ use core::either::Either;
 use core::either;
 use core::io::WriterUtil;
 use core::io;
-use core::libc::size_t;
 use core::comm::{stream, Chan, Port, SharedChan};
 use core::option;
 use core::prelude::*;