Skip to content

Commit d3f70b1

Browse files
committed
Fix many warnings.
1 parent 9283dfe commit d3f70b1

File tree

13 files changed

+7
-18
lines changed

13 files changed

+7
-18
lines changed

src/libcore/rt/uv/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ pub fn uv_error_to_io_error(uverr: UvError) -> IoError {
273273
ECONNREFUSED => ConnectionRefused,
274274
ECONNRESET => ConnectionReset,
275275
EPIPE => BrokenPipe,
276-
e => {
277-
rtdebug!("e %u", e as uint);
276+
_ => {
277+
rtdebug!("uverr.code %u", uverr.code as uint);
278278
// XXX: Need to map remaining uv error types
279279
OtherIoError
280280
}

src/librustc/middle/borrowck/gather_loans/lifetime.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//! This module implements the check that the lifetime of a borrow
1212
//! does not exceed the lifetime of the value being borrowed.
1313
14-
use core::prelude::*;
1514
use middle::borrowck::*;
1615
use mc = middle::mem_categorization;
1716
use middle::ty;

src/librustc/middle/borrowck/gather_loans/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
// their associated scopes. In phase two, checking loans, we will then make
1717
// sure that all of these loans are honored.
1818

19-
use core::prelude::*;
20-
2119
use middle::borrowck::*;
2220
use mc = middle::mem_categorization;
2321
use middle::pat_util;

src/librustc/middle/borrowck/gather_loans/restrictions.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
//! Computes the restrictions that result from a borrow.
1212
13-
use core::prelude::*;
1413
use middle::borrowck::*;
1514
use mc = middle::mem_categorization;
1615
use middle::ty;

src/librustc/middle/borrowck/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
/*! See doc.rs for a thorough explanation of the borrow checker */
1212

13-
use core::prelude::*;
14-
1513
use mc = middle::mem_categorization;
1614
use middle::ty;
1715
use middle::typeck;

src/librustc/middle/dataflow.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* GEN and KILL bits for each expression.
1717
*/
1818

19-
use core::prelude::*;
2019
use core::cast;
2120
use core::uint;
2221
use syntax::ast;

src/librustc/middle/trans/consts.rs

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use util::ppaux::{Repr, ty_to_str};
2727

2828
use core::libc::c_uint;
2929
use syntax::{ast, ast_util, ast_map};
30-
use util::ppaux::ty_to_str;
3130

3231
pub fn const_lit(cx: @CrateContext, e: @ast::expr, lit: ast::lit)
3332
-> ValueRef {

src/librustc/middle/trans/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ use middle::trans::type_of;
145145
use middle::ty::struct_fields;
146146
use middle::ty::{AutoDerefRef, AutoAddEnv};
147147
use middle::ty::{AutoPtr, AutoBorrowVec, AutoBorrowVecRef, AutoBorrowFn,
148-
AutoDerefRef, AutoAddEnv, AutoUnsafe};
148+
AutoUnsafe};
149149
use middle::ty;
150150
use util::common::indenter;
151151
use util::ppaux::Repr;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ use middle::typeck::infer::glb::Glb;
6262
use middle::typeck::infer::lub::Lub;
6363
use middle::typeck::infer::sub::Sub;
6464
use middle::typeck::infer::to_str::InferStr;
65-
use middle::typeck::infer::{cres, InferCtxt, ures, IntType, UintType};
65+
use middle::typeck::infer::{cres, InferCtxt, ures};
6666
use util::common::indent;
6767

6868
use core::result::{iter_vec2, map_vec2};

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

-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ use middle::typeck::infer::glb::Glb;
4141
use middle::typeck::infer::lub::Lub;
4242
use middle::typeck::infer::unify::*;
4343
use middle::typeck::infer::sub::Sub;
44-
use middle::typeck::infer::lub::Lub;
45-
use middle::typeck::infer::glb::Glb;
4644
use middle::typeck::infer::to_str::InferStr;
4745
use util::common::indenter;
4846

src/librustpkg/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc::driver::{driver, session};
1616
use rustc::metadata::filesearch;
1717
use std::getopts::groups::getopts;
1818
use std::semver;
19-
use std::{term, getopts};
19+
use std::term;
2020
use syntax::ast_util::*;
2121
use syntax::codemap::{dummy_sp, spanned, dummy_spanned};
2222
use syntax::ext::base::{mk_ctxt, ext_ctxt};

src/libsyntax/opt_vec.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* other useful things like `push()` and `len()`.
1717
*/
1818

19-
use core::prelude::*;
2019
use core::old_iter;
2120
use core::old_iter::BaseIter;
2221

src/libsyntax/parse/parser.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ use ast::{expr_ret, expr_self, expr_struct, expr_tup, expr_unary};
3030
use ast::{expr_vec, expr_vstore, expr_vstore_mut_box};
3131
use ast::{expr_vstore_slice, expr_vstore_box};
3232
use ast::{expr_vstore_mut_slice, expr_while, extern_fn, field, fn_decl};
33-
use ast::{expr_vstore_uniq, TyClosure, TyBareFn, Onceness, Once, Many};
33+
use ast::{expr_vstore_uniq, Onceness, Once, Many};
3434
use ast::{foreign_item, foreign_item_const, foreign_item_fn, foreign_mod};
3535
use ast::{ident, impure_fn, inherited, item, item_, item_const};
36-
use ast::{item_const, item_enum, item_fn, item_foreign_mod, item_impl};
36+
use ast::{item_enum, item_fn, item_foreign_mod, item_impl};
3737
use ast::{item_mac, item_mod, item_struct, item_trait, item_ty, lit, lit_};
3838
use ast::{lit_bool, lit_float, lit_float_unsuffixed, lit_int};
3939
use ast::{lit_int_unsuffixed, lit_nil, lit_str, lit_uint, local, m_const};

0 commit comments

Comments
 (0)