Skip to content

Commit 71b1c6a

Browse files
committed
Warning cleanup
1 parent 95d22a3 commit 71b1c6a

File tree

13 files changed

+11
-32
lines changed

13 files changed

+11
-32
lines changed

Diff for: src/libextra/bitv.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ impl BitvSet {
862862

863863
#[cfg(test)]
864864
mod tests {
865-
use std::test::BenchHarness;
865+
use extra::test::BenchHarness;
866866

867867
use bitv::*;
868868
use bitv;

Diff for: src/libextra/deque.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ mod tests {
255255
use super::*;
256256
use std::cmp::Eq;
257257
use std::kinds::Copy;
258-
use core;
258+
use std::int;
259259

260260
#[test]
261261
fn test_simple() {
@@ -462,12 +462,12 @@ mod tests {
462462
#[test]
463463
fn test_iter() {
464464
let mut d = Deque::new();
465-
for std::int::range(0,5) |i| {
465+
for int::range(0,5) |i| {
466466
d.add_back(i);
467467
}
468468
assert_eq!(d.iter().collect::<~[&int]>(), ~[&0,&1,&2,&3,&4]);
469469

470-
for std::int::range(6,9) |i| {
470+
for int::range(6,9) |i| {
471471
d.add_front(i);
472472
}
473473
assert_eq!(d.iter().collect::<~[&int]>(), ~[&8,&7,&6,&0,&1,&2,&3,&4]);
@@ -476,12 +476,12 @@ mod tests {
476476
#[test]
477477
fn test_rev_iter() {
478478
let mut d = Deque::new();
479-
for std::int::range(0,5) |i| {
479+
for int::range(0,5) |i| {
480480
d.add_back(i);
481481
}
482482
assert_eq!(d.rev_iter().collect::<~[&int]>(), ~[&4,&3,&2,&1,&0]);
483483

484-
for std::int::range(6,9) |i| {
484+
for int::range(6,9) |i| {
485485
d.add_front(i);
486486
}
487487
assert_eq!(d.rev_iter().collect::<~[&int]>(), ~[&4,&3,&2,&1,&0,&6,&7,&8]);

Diff for: src/libextra/json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ mod tests {
13621362
use std::io;
13631363
use std::result;
13641364

1365-
use std::serialize::Decodable;
1365+
use extra::serialize::Decodable;
13661366

13671367
#[deriving(Eq, Encodable, Decodable)]
13681368
enum Animal {

Diff for: src/librustc/metadata/decoder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ impl<'self> EachItemContext<'self> {
538538

539539
fn each_item_of_module(&mut self, def_id: ast::def_id) -> bool {
540540
// This item might not be in this crate. If it's not, look it up.
541-
let (cdata, items) = if def_id.crate == self.cdata.cnum {
541+
let (_cdata, items) = if def_id.crate == self.cdata.cnum {
542542
let items = reader::get_doc(reader::Doc(self.cdata.data),
543543
tag_items);
544544
(self.cdata, items)

Diff for: src/librustc/metadata/encoder.rs

-5
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ fn encode_trait_ref(ebml_w: &mut writer::Encoder,
151151
ecx: &EncodeContext,
152152
trait_ref: &ty::TraitRef,
153153
tag: uint) {
154-
let r = ecx.reachable;
155154
let ty_str_ctxt = @tyencode::ctxt {
156155
diag: ecx.diag,
157156
ds: def_to_str,
@@ -179,7 +178,6 @@ fn encode_ty_type_param_defs(ebml_w: &mut writer::Encoder,
179178
ecx: &EncodeContext,
180179
params: @~[ty::TypeParameterDef],
181180
tag: uint) {
182-
let r = ecx.reachable;
183181
let ty_str_ctxt = @tyencode::ctxt {
184182
diag: ecx.diag,
185183
ds: def_to_str,
@@ -212,7 +210,6 @@ fn encode_variant_id(ebml_w: &mut writer::Encoder, vid: def_id) {
212210
pub fn write_type(ecx: &EncodeContext,
213211
ebml_w: &mut writer::Encoder,
214212
typ: ty::t) {
215-
let r = ecx.reachable;
216213
let ty_str_ctxt = @tyencode::ctxt {
217214
diag: ecx.diag,
218215
ds: def_to_str,
@@ -225,7 +222,6 @@ pub fn write_type(ecx: &EncodeContext,
225222
pub fn write_vstore(ecx: &EncodeContext,
226223
ebml_w: &mut writer::Encoder,
227224
vstore: ty::vstore) {
228-
let r = ecx.reachable;
229225
let ty_str_ctxt = @tyencode::ctxt {
230226
diag: ecx.diag,
231227
ds: def_to_str,
@@ -258,7 +254,6 @@ fn encode_method_fty(ecx: &EncodeContext,
258254
typ: &ty::BareFnTy) {
259255
ebml_w.start_tag(tag_item_method_fty);
260256

261-
let r = ecx.reachable;
262257
let ty_str_ctxt = @tyencode::ctxt {
263258
diag: ecx.diag,
264259
ds: def_to_str,

Diff for: src/librustc/middle/reachable.rs

-3
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,14 @@
1717

1818
use std::iterator::IteratorUtil;
1919

20-
use middle::resolve;
2120
use middle::ty;
2221
use middle::typeck;
2322

2423
use std::hashmap::HashSet;
2524
use syntax::ast::*;
26-
use syntax::ast;
2725
use syntax::ast_map;
2826
use syntax::ast_util::def_id_of_def;
2927
use syntax::attr;
30-
use syntax::codemap;
3128
use syntax::parse::token;
3229
use syntax::visit::Visitor;
3330
use syntax::visit;

Diff for: src/librustc/middle/resolve.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ impl Resolver {
13071307
visit_item(item, (parent, visitor));
13081308
}
13091309

1310-
item_impl(_, Some(_), ty, ref methods) => {
1310+
item_impl(_, Some(_), _ty, ref _methods) => {
13111311
visit_item(item, (parent, visitor));
13121312
}
13131313

Diff for: src/librustc/middle/trans/callee.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
/*!
12-
*
1312
* Handles translation of callees as well as other call-related
1413
* things. Callees are a superset of normal rust values and sometimes
1514
* have different representations. In particular, top-level fn items

Diff for: src/librustc/middle/trans/expr.rs

-2
Original file line numberDiff line numberDiff line change
@@ -909,8 +909,6 @@ fn trans_lvalue_unadjusted(bcx: block, expr: @ast::expr) -> DatumBlock {
909909
let (bcx, base, len) =
910910
base_datum.get_vec_base_and_len(bcx, index_expr.span,
911911
index_expr.id, 0);
912-
let mut bcx = bcx;
913-
let mut base = base;
914912
let mut len = len;
915913

916914
if ty::type_is_str(base_ty) {

Diff for: src/librustc/middle/typeck/coherence.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use middle::typeck::infer::combine::Combine;
3636
use middle::typeck::infer::InferCtxt;
3737
use middle::typeck::infer::{new_infer_ctxt, resolve_ivar};
3838
use middle::typeck::infer::{resolve_nested_tvar, resolve_type};
39-
use syntax::ast::{crate, def_id, def_mod, def_struct, def_ty};
39+
use syntax::ast::{crate, def_id, def_struct, def_ty};
4040
use syntax::ast::{item, item_enum, item_impl, item_mod, item_struct};
4141
use syntax::ast::{local_crate, method, trait_ref, ty_path};
4242
use syntax::ast;

Diff for: src/librustc/middle/typeck/infer/combine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ use middle::typeck::infer::glb::Glb;
6363
use middle::typeck::infer::lub::Lub;
6464
use middle::typeck::infer::sub::Sub;
6565
use middle::typeck::infer::to_str::InferStr;
66-
use middle::typeck::infer::unify::{InferCtxtMethods, UnifyInferCtxtMethods};
66+
use middle::typeck::infer::unify::{InferCtxtMethods};
6767
use middle::typeck::infer::{InferCtxt, cres, ures};
6868
use util::common::indent;
6969

Diff for: src/librustc/util/ppaux.rs

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ use syntax::parse::token;
3131
use syntax::print::pprust;
3232
use syntax::{ast, ast_util};
3333

34-
use std::vec;
35-
3634
/// Produces a string suitable for debugging output.
3735
pub trait Repr {
3836
fn repr(&self, tcx: ctxt) -> ~str;

Diff for: src/libsyntax/parse/common.rs

-8
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use ast;
12-
use codemap::{BytePos, spanned};
13-
use parse::lexer::reader;
14-
use parse::parser::Parser;
15-
use parse::token::keywords;
1611
use parse::token;
1712
use parse::token::{get_ident_interner};
1813

19-
use opt_vec;
20-
use opt_vec::OptVec;
21-
2214
// SeqSep : a sequence separator (token)
2315
// and whether a trailing separator is allowed.
2416
pub struct SeqSep {

0 commit comments

Comments
 (0)