---

yaml
---
r: 50666
b: refs/heads/try
c: 34113dc
h: refs/heads/master
v: v3

Author: brson

[refs]

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

branches/try/src/libcore/at_vec.rs

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

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

@@ -10,6 +10,10 @@
 
 #[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/prelude.rs

@@ -43,6 +43,10 @@ pub use vec::{CopyableVector, ImmutableVector};
 pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
 pub use vec::{OwnedVector, OwnedCopyableVector};
 
+/* Reexported runtime types */
+pub use comm::{stream, Port, Chan, GenericChan, GenericSmartChan, GenericPort, Peekable};
+pub use task::spawn;
+
 /* Reexported modules */
 
 pub use at_vec;

branches/try/src/libcore/vec.rs

@@ -19,6 +19,7 @@ use iter::BaseIter;
 use iter;
 use kinds::Copy;
 use libc;
+use libc::size_t;
 use option::{None, Option, Some};
 use unstable::intrinsics;
 use ptr;
@@ -75,9 +76,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 libc::size_t);
+                rustrt::vec_reserve_shared_actual(td, ptr, n as size_t);
             } else {
-                rustrt::vec_reserve_shared(td, ptr, n as libc::size_t);
+                rustrt::vec_reserve_shared(td, ptr, n as size_t);
             }
         }
     }
@@ -2070,6 +2071,7 @@ 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,6 +30,7 @@ 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,6 +1706,7 @@ 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,6 +26,7 @@ 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::*;