Skip to content

Commit ab46a38

Browse files
committed
auto merge of #6632 : steveklabnik/rust/remove_more_warnings, r=thestinger
With this, the build is almost 100% warning free. One more can be fixed after the next snapshot, and there's one other that I filed an issue about already.
2 parents ea06407 + d3f70b1 commit ab46a38

File tree

13 files changed

+7
-18
lines changed

13 files changed

+7
-18
lines changed

src/libcore/rt/uv/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ pub fn uv_error_to_io_error(uverr: UvError) -> IoError {
270270
ECONNREFUSED => ConnectionRefused,
271271
ECONNRESET => ConnectionReset,
272272
EPIPE => BrokenPipe,
273-
e => {
274-
rtdebug!("e %u", e as uint);
273+
_ => {
274+
rtdebug!("uverr.code %u", uverr.code as uint);
275275
// XXX: Need to map remaining uv error types
276276
OtherIoError
277277
}

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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use util::ppaux::{Repr, ty_to_str};
3030

3131
use core::libc::c_uint;
3232
use syntax::{ast, ast_util, ast_map};
33-
use util::ppaux::ty_to_str;
3433

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

src/librustc/middle/trans/expr.rs

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 2 deletions
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

0 commit comments

Comments
 (0)