Skip to content

Commit 7ce68dc

Browse files
author
James Miller
committed
Clean up warnings
1 parent 47eca21 commit 7ce68dc

File tree

12 files changed

+7
-31
lines changed

12 files changed

+7
-31
lines changed

src/librustc/middle/trans/common.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ use std::cast::transmute;
3434
use std::cast;
3535
use std::hashmap::{HashMap};
3636
use std::libc::{c_uint, c_longlong, c_ulonglong};
37-
use std::to_bytes;
38-
use std::str;
39-
use std::vec::raw::to_ptr;
4037
use std::vec;
4138
use syntax::ast::ident;
4239
use syntax::ast_map::{path, path_elt};

src/librustc/middle/trans/meth.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,6 @@ pub fn trans_trait_callee_from_llval(bcx: block,
548548

549549
let _icx = push_ctxt("impl::trans_trait_callee");
550550
let ccx = bcx.ccx();
551-
let mut bcx = bcx;
552551

553552
// Load the vtable from the @Trait pair
554553
debug!("(translating trait callee) loading vtable from pair %s",

src/librustc/middle/trans/uniq.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111

12-
use back;
1312
use lib::llvm::ValueRef;
1413
use middle::trans::base::*;
1514
use middle::trans::build::*;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ pub fn check_fn(ccx: @mut CrateCtxt,
463463
}
464464

465465
// Check the pattern.
466-
let region = fcx.block_region();
467466
let pcx = pat_ctxt {
468467
fcx: fcx,
469468
map: pat_id_map(tcx.def_map, input.pat),
@@ -2892,7 +2891,6 @@ pub fn check_decl_local(fcx: @mut FnCtxt, local: @ast::local) {
28922891
_ => {}
28932892
}
28942893

2895-
let region = tcx.region_maps.encl_region(local.node.id);
28962894
let pcx = pat_ctxt {
28972895
fcx: fcx,
28982896
map: pat_id_map(tcx.def_map, local.node.pat),

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ use middle::typeck::check::regionmanip::relate_nested_regions;
3636
use middle::typeck::infer::resolve_and_force_all_but_regions;
3737
use middle::typeck::infer::resolve_type;
3838
use middle::typeck::infer;
39-
use util::ppaux::{note_and_explain_region, ty_to_str,
40-
region_to_str};
39+
use util::ppaux::{ty_to_str, region_to_str};
4140
use middle::pat_util;
4241

43-
use std::result;
4442
use std::uint;
4543
use syntax::ast::{ManagedSigil, OwnedSigil, BorrowedSigil};
4644
use syntax::ast::{def_arg, def_binding, def_local, def_self, def_upvar};
@@ -419,8 +417,6 @@ fn constrain_callee(rcx: @mut Rcx,
419417
call_expr: @ast::expr,
420418
callee_expr: @ast::expr)
421419
{
422-
let tcx = rcx.fcx.tcx();
423-
424420
let call_region = ty::re_scope(call_expr.id);
425421

426422
let callee_ty = rcx.resolve_node_type(callee_id);
@@ -559,8 +555,6 @@ fn constrain_index(rcx: @mut Rcx,
559555
* includes the deref expr.
560556
*/
561557

562-
let tcx = rcx.fcx.tcx();
563-
564558
debug!("constrain_index(index_expr=?, indexed_ty=%s",
565559
rcx.fcx.infcx().ty_to_str(indexed_ty));
566560

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,14 @@ use middle::typeck::infer::sub::Sub;
6565
use middle::typeck::infer::to_str::InferStr;
6666
use middle::typeck::infer::unify::{InferCtxtMethods};
6767
use middle::typeck::infer::{InferCtxt, cres, ures};
68-
use middle::typeck::infer::{TypeOrigin, TypeTrace};
68+
use middle::typeck::infer::{TypeTrace};
6969
use util::common::indent;
7070

7171
use std::result::{iter_vec2, map_vec2};
7272
use std::vec;
7373
use syntax::ast::{Onceness, purity};
7474
use syntax::ast;
7575
use syntax::opt_vec;
76-
use syntax::codemap::span;
7776
use syntax::abi::AbiSet;
7877

7978
pub trait Combine {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,18 @@ time of error detection.
5959
6060
*/
6161

62-
use std::prelude::*;
6362
use middle::ty;
6463
use middle::ty::Region;
6564
use middle::typeck::infer;
6665
use middle::typeck::infer::InferCtxt;
6766
use middle::typeck::infer::TypeTrace;
68-
use middle::typeck::infer::TypeOrigin;
6967
use middle::typeck::infer::SubregionOrigin;
7068
use middle::typeck::infer::RegionVariableOrigin;
71-
use middle::typeck::infer::Types;
72-
use middle::typeck::infer::TraitRefs;
7369
use middle::typeck::infer::ValuePairs;
7470
use middle::typeck::infer::region_inference::RegionResolutionError;
7571
use middle::typeck::infer::region_inference::ConcreteFailure;
7672
use middle::typeck::infer::region_inference::SubSupConflict;
7773
use middle::typeck::infer::region_inference::SupSupConflict;
78-
use syntax::opt_vec;
7974
use syntax::opt_vec::OptVec;
8075
use util::ppaux::UserString;
8176
use util::ppaux::note_and_explain_region;
@@ -362,7 +357,7 @@ impl ErrorReporting for InferCtxt {
362357
sup,
363358
"");
364359
}
365-
infer::ReferenceOutlivesReferent(ty, span) => {
360+
infer::ReferenceOutlivesReferent(ty, _) => {
366361
self.tcx.sess.span_err(
367362
origin.span(),
368363
fmt!("in type `%s`, pointer has a longer lifetime than \

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ use syntax::ast::{Many, Once, extern_fn, impure_fn, m_const, m_imm, m_mutbl};
2626
use syntax::ast::{unsafe_fn};
2727
use syntax::ast::{Onceness, purity};
2828
use syntax::abi::AbiSet;
29-
use syntax::codemap::span;
30-
use util::common::{indent, indenter};
29+
use util::common::{indenter};
3130
use util::ppaux::mt_to_str;
3231

3332
use extra::list;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use middle::typeck::infer::{cres, InferCtxt};
2121
use middle::typeck::infer::fold_regions_in_sig;
2222
use middle::typeck::infer::{TypeTrace, Subtype};
2323
use middle::typeck::isr_alist;
24-
use util::common::indent;
2524
use util::ppaux::mt_to_str;
2625

2726
use extra::list;
@@ -30,7 +29,6 @@ use syntax::ast;
3029
use syntax::ast::{Many, Once, extern_fn, m_const, impure_fn};
3130
use syntax::ast::{unsafe_fn};
3231
use syntax::ast::{Onceness, purity};
33-
use syntax::codemap::span;
3432

3533
pub struct Lub(CombineFields); // least-upper-bound: common supertype
3634

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ pub fn can_mk_subty(cx: @mut InferCtxt, a: ty::t, b: ty::t) -> ures {
328328
}
329329

330330
pub fn mk_subr(cx: @mut InferCtxt,
331-
a_is_expected: bool,
331+
_a_is_expected: bool,
332332
origin: SubregionOrigin,
333333
a: ty::Region,
334334
b: ty::Region) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ use middle::typeck::infer::cres;
1919
use middle::typeck::infer::{RegionVariableOrigin, SubregionOrigin};
2020
use middle::typeck::infer;
2121
use util::common::indenter;
22-
use util::ppaux::{note_and_explain_region, Repr, UserString};
22+
use util::ppaux::{Repr};
2323

2424
use std::cell::Cell;
2525
use std::hashmap::{HashMap, HashSet};
2626
use std::uint;
2727
use std::vec;
28-
use syntax::codemap::span;
2928
use syntax::ast;
3029
use syntax::opt_vec;
3130
use syntax::opt_vec::OptVec;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ use middle::typeck::infer::lattice::CombineFieldsLatticeMethods;
2121
use middle::typeck::infer::lub::Lub;
2222
use middle::typeck::infer::to_str::InferStr;
2323
use middle::typeck::infer::{TypeTrace, Subtype};
24-
use util::common::{indent, indenter};
24+
use util::common::{indenter};
2525
use util::ppaux::bound_region_to_str;
2626

2727
use extra::list::Nil;
2828
use extra::list;
2929
use syntax::abi::AbiSet;
3030
use syntax::ast;
3131
use syntax::ast::{Onceness, m_const, purity};
32-
use syntax::codemap::span;
3332

3433
pub struct Sub(CombineFields); // "subtype", "subregion" etc
3534

0 commit comments

Comments
 (0)