---

yaml
---
r: 142477
b: refs/heads/try2
c: 7ce68dc
h: refs/heads/master
i:
  142475: c617b2f
v: v3

Author: James Miller

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 47eca2113c5c55a4ffbb8c11a38c8ca7a79a1d72
+refs/heads/try2: 7ce68dc9e1c47f5f7d297bc3094e21c9e3c9fd34
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/common.rs

@@ -34,9 +34,6 @@ use std::cast::transmute;
 use std::cast;
 use std::hashmap::{HashMap};
 use std::libc::{c_uint, c_longlong, c_ulonglong};
-use std::to_bytes;
-use std::str;
-use std::vec::raw::to_ptr;
 use std::vec;
 use syntax::ast::ident;
 use syntax::ast_map::{path, path_elt};

branches/try2/src/librustc/middle/trans/meth.rs

@@ -548,7 +548,6 @@ pub fn trans_trait_callee_from_llval(bcx: block,
 
     let _icx = push_ctxt("impl::trans_trait_callee");
     let ccx = bcx.ccx();
-    let mut bcx = bcx;
 
     // Load the vtable from the @Trait pair
     debug!("(translating trait callee) loading vtable from pair %s",

branches/try2/src/librustc/middle/trans/uniq.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-use back;
 use lib::llvm::ValueRef;
 use middle::trans::base::*;
 use middle::trans::build::*;

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

@@ -463,7 +463,6 @@ pub fn check_fn(ccx: @mut CrateCtxt,
             }
 
             // Check the pattern.
-            let region = fcx.block_region();
             let pcx = pat_ctxt {
                 fcx: fcx,
                 map: pat_id_map(tcx.def_map, input.pat),
@@ -2892,7 +2891,6 @@ pub fn check_decl_local(fcx: @mut FnCtxt, local: @ast::local)  {
         _ => {}
     }
 
-    let region = tcx.region_maps.encl_region(local.node.id);
     let pcx = pat_ctxt {
         fcx: fcx,
         map: pat_id_map(tcx.def_map, local.node.pat),

branches/try2/src/librustc/middle/typeck/check/regionck.rs

@@ -36,11 +36,9 @@ use middle::typeck::check::regionmanip::relate_nested_regions;
 use middle::typeck::infer::resolve_and_force_all_but_regions;
 use middle::typeck::infer::resolve_type;
 use middle::typeck::infer;
-use util::ppaux::{note_and_explain_region, ty_to_str,
-                  region_to_str};
+use util::ppaux::{ty_to_str, region_to_str};
 use middle::pat_util;
 
-use std::result;
 use std::uint;
 use syntax::ast::{ManagedSigil, OwnedSigil, BorrowedSigil};
 use syntax::ast::{def_arg, def_binding, def_local, def_self, def_upvar};
@@ -419,8 +417,6 @@ fn constrain_callee(rcx: @mut Rcx,
                     call_expr: @ast::expr,
                     callee_expr: @ast::expr)
 {
-    let tcx = rcx.fcx.tcx();
-
     let call_region = ty::re_scope(call_expr.id);
 
     let callee_ty = rcx.resolve_node_type(callee_id);
@@ -559,8 +555,6 @@ fn constrain_index(rcx: @mut Rcx,
      * includes the deref expr.
      */
 
-    let tcx = rcx.fcx.tcx();
-
     debug!("constrain_index(index_expr=?, indexed_ty=%s",
            rcx.fcx.infcx().ty_to_str(indexed_ty));
 

branches/try2/src/librustc/middle/typeck/infer/combine.rs

@@ -65,15 +65,14 @@ use middle::typeck::infer::sub::Sub;
 use middle::typeck::infer::to_str::InferStr;
 use middle::typeck::infer::unify::{InferCtxtMethods};
 use middle::typeck::infer::{InferCtxt, cres, ures};
-use middle::typeck::infer::{TypeOrigin, TypeTrace};
+use middle::typeck::infer::{TypeTrace};
 use util::common::indent;
 
 use std::result::{iter_vec2, map_vec2};
 use std::vec;
 use syntax::ast::{Onceness, purity};
 use syntax::ast;
 use syntax::opt_vec;
-use syntax::codemap::span;
 use syntax::abi::AbiSet;
 
 pub trait Combine {

branches/try2/src/librustc/middle/typeck/infer/error_reporting.rs

@@ -59,23 +59,18 @@ time of error detection.
 
 */
 
-use std::prelude::*;
 use middle::ty;
 use middle::ty::Region;
 use middle::typeck::infer;
 use middle::typeck::infer::InferCtxt;
 use middle::typeck::infer::TypeTrace;
-use middle::typeck::infer::TypeOrigin;
 use middle::typeck::infer::SubregionOrigin;
 use middle::typeck::infer::RegionVariableOrigin;
-use middle::typeck::infer::Types;
-use middle::typeck::infer::TraitRefs;
 use middle::typeck::infer::ValuePairs;
 use middle::typeck::infer::region_inference::RegionResolutionError;
 use middle::typeck::infer::region_inference::ConcreteFailure;
 use middle::typeck::infer::region_inference::SubSupConflict;
 use middle::typeck::infer::region_inference::SupSupConflict;
-use syntax::opt_vec;
 use syntax::opt_vec::OptVec;
 use util::ppaux::UserString;
 use util::ppaux::note_and_explain_region;
@@ -362,7 +357,7 @@ impl ErrorReporting for InferCtxt {
                     sup,
                     "");
             }
-            infer::ReferenceOutlivesReferent(ty, span) => {
+            infer::ReferenceOutlivesReferent(ty, _) => {
                 self.tcx.sess.span_err(
                     origin.span(),
                     fmt!("in type `%s`, pointer has a longer lifetime than \

branches/try2/src/librustc/middle/typeck/infer/glb.rs

@@ -26,8 +26,7 @@ use syntax::ast::{Many, Once, extern_fn, impure_fn, m_const, m_imm, m_mutbl};
 use syntax::ast::{unsafe_fn};
 use syntax::ast::{Onceness, purity};
 use syntax::abi::AbiSet;
-use syntax::codemap::span;
-use util::common::{indent, indenter};
+use util::common::{indenter};
 use util::ppaux::mt_to_str;
 
 use extra::list;

branches/try2/src/librustc/middle/typeck/infer/lub.rs

@@ -21,7 +21,6 @@ use middle::typeck::infer::{cres, InferCtxt};
 use middle::typeck::infer::fold_regions_in_sig;
 use middle::typeck::infer::{TypeTrace, Subtype};
 use middle::typeck::isr_alist;
-use util::common::indent;
 use util::ppaux::mt_to_str;
 
 use extra::list;
@@ -30,7 +29,6 @@ use syntax::ast;
 use syntax::ast::{Many, Once, extern_fn, m_const, impure_fn};
 use syntax::ast::{unsafe_fn};
 use syntax::ast::{Onceness, purity};
-use syntax::codemap::span;
 
 pub struct Lub(CombineFields);  // least-upper-bound: common supertype
 

branches/try2/src/librustc/middle/typeck/infer/mod.rs

@@ -328,7 +328,7 @@ pub fn can_mk_subty(cx: @mut InferCtxt, a: ty::t, b: ty::t) -> ures {
 }
 
 pub fn mk_subr(cx: @mut InferCtxt,
-               a_is_expected: bool,
+               _a_is_expected: bool,
                origin: SubregionOrigin,
                a: ty::Region,
                b: ty::Region) {

branches/try2/src/librustc/middle/typeck/infer/region_inference/mod.rs

@@ -19,13 +19,12 @@ use middle::typeck::infer::cres;
 use middle::typeck::infer::{RegionVariableOrigin, SubregionOrigin};
 use middle::typeck::infer;
 use util::common::indenter;
-use util::ppaux::{note_and_explain_region, Repr, UserString};
+use util::ppaux::{Repr};
 
 use std::cell::Cell;
 use std::hashmap::{HashMap, HashSet};
 use std::uint;
 use std::vec;
-use syntax::codemap::span;
 use syntax::ast;
 use syntax::opt_vec;
 use syntax::opt_vec::OptVec;

branches/try2/src/librustc/middle/typeck/infer/sub.rs

@@ -21,15 +21,14 @@ use middle::typeck::infer::lattice::CombineFieldsLatticeMethods;
 use middle::typeck::infer::lub::Lub;
 use middle::typeck::infer::to_str::InferStr;
 use middle::typeck::infer::{TypeTrace, Subtype};
-use util::common::{indent, indenter};
+use util::common::{indenter};
 use util::ppaux::bound_region_to_str;
 
 use extra::list::Nil;
 use extra::list;
 use syntax::abi::AbiSet;
 use syntax::ast;
 use syntax::ast::{Onceness, m_const, purity};
-use syntax::codemap::span;
 
 pub struct Sub(CombineFields);  // "subtype", "subregion" etc