Skip to content

Commit bd7eb7e

Browse files
committed
auto merge of #5653 : brson/rust/warnings, r=brson
2 parents be79258 + e3327d3 commit bd7eb7e

File tree

18 files changed

+21
-30
lines changed

18 files changed

+21
-30
lines changed

src/librustc/metadata/creader.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use metadata::decoder;
1818
use metadata::filesearch::FileSearch;
1919
use metadata::loader;
2020

21-
use core::either;
2221
use core::hashmap::linear::LinearMap;
2322
use core::vec;
2423
use syntax::attr;

src/librustc/middle/lint.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use util::ppaux::{ty_to_str};
1818
use core::hashmap::linear::LinearMap;
1919
use core::char;
2020
use core::cmp;
21-
use core::either;
2221
use core::i8;
2322
use core::i16;
2423
use core::i32;

src/librustc/middle/moves.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,8 @@ pub impl VisitContext {
718718
}
719719

720720
fn use_receiver(&self,
721-
expr_id: node_id,
722-
span: span,
721+
_expr_id: node_id,
722+
_span: span,
723723
receiver_expr: @expr,
724724
visitor: vt<VisitContext>)
725725
{

src/librustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ pub impl Resolver {
13581358
item_id: def_id,
13591359
+parent_privacy: Privacy,
13601360
parent: ReducedGraphParent,
1361-
&&visitor: vt<ReducedGraphParent>) {
1361+
&&_visitor: vt<ReducedGraphParent>) {
13621362
let ident = variant.node.name;
13631363
let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
13641364
variant.span);

src/librustc/middle/trans/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use core::prelude::*;
1212

1313
use back::abi;
14-
use lib::llvm::{llvm, SetLinkage, InternalLinkage, PrivateLinkage,
14+
use lib::llvm::{llvm, SetLinkage, PrivateLinkage,
1515
ValueRef, TypeRef, Bool, True, False};
1616
use metadata::csearch;
1717
use middle::const_eval;

src/librustc/middle/trans/foreign.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use core::prelude::*;
1212

1313
use back::{link, abi};
14-
use driver::session;
1514
use lib::llvm::{SequentiallyConsistent, Acquire, Release, Xchg};
1615
use lib::llvm::{TypeRef, ValueRef};
1716
use lib;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ use util::common::{block_query, indenter, loop_query};
110110
use util::ppaux::{bound_region_to_str, expr_repr, pat_repr};
111111
use util::ppaux;
112112

113-
use core::either;
114113
use core::hashmap::linear::LinearMap;
115114
use core::ptr;
116115
use core::result::{Result, Ok, Err};
@@ -119,7 +118,7 @@ use core::str;
119118
use core::vec;
120119
use std::list::Nil;
121120
use syntax::abi::AbiSet;
122-
use syntax::ast::{provided, required, ty_i};
121+
use syntax::ast::{provided, required};
123122
use syntax::ast;
124123
use syntax::ast_map;
125124
use syntax::ast_util::local_def;
@@ -3021,7 +3020,7 @@ pub fn check_enum_variants(ccx: @mut CrateCtxt,
30213020
vs: &[ast::variant],
30223021
id: ast::node_id) {
30233022
fn do_check(ccx: @mut CrateCtxt,
3024-
sp: span,
3023+
_sp: span,
30253024
vs: &[ast::variant],
30263025
id: ast::node_id,
30273026
disr_vals: &mut ~[int],
@@ -3303,7 +3302,7 @@ pub fn type_is_c_like_enum(fcx: @mut FnCtxt, sp: span, typ: ty::t) -> bool {
33033302

33043303
pub fn ast_expr_vstore_to_vstore(fcx: @mut FnCtxt,
33053304
e: @ast::expr,
3306-
n: uint,
3305+
_n: uint,
33073306
v: ast::expr_vstore)
33083307
-> ty::vstore {
33093308
match v {

src/librustc/middle/typeck/collect.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ are represented as `ty_param()` instances.
3333
use core::prelude::*;
3434

3535
use metadata::csearch;
36-
use middle::ty::{InstantiatedTraitRef, arg};
36+
use middle::ty::InstantiatedTraitRef;
3737
use middle::ty::{substs, ty_param_bounds_and_ty, ty_param_substs_and_ty};
3838
use middle::ty;
3939
use middle::typeck::astconv::{AstConv, ty_of_arg};
@@ -860,7 +860,7 @@ pub fn ty_of_item(ccx: &CrateCtxt, it: @ast::item)
860860
tcx.tcache.insert(local_def(it.id), tpt);
861861
return tpt;
862862
}
863-
ast::item_fn(ref decl, purity, abi, ref generics, _) => {
863+
ast::item_fn(ref decl, purity, _, ref generics, _) => {
864864
let bounds = ty_param_bounds(ccx, generics);
865865
let tofd = astconv::ty_of_bare_fn(ccx,
866866
&empty_rscope,

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,19 @@ we may want to adjust precisely when coercions occur.
6666

6767
use core::prelude::*;
6868

69-
use middle::ty::{TyVar, AutoPtr, AutoBorrowVec, AutoBorrowFn};
70-
use middle::ty::{AutoAdjustment, AutoDerefRef, AutoRef};
71-
use middle::ty::{vstore_slice, vstore_box, vstore_uniq, vstore_fixed};
69+
use middle::ty::{AutoPtr, AutoBorrowVec, AutoBorrowFn};
70+
use middle::ty::{AutoDerefRef, AutoRef};
71+
use middle::ty::{vstore_slice, vstore_box, vstore_uniq};
7272
use middle::ty::{mt};
7373
use middle::ty;
7474
use middle::typeck::infer::{CoerceResult, resolve_type};
7575
use middle::typeck::infer::combine::CombineFields;
7676
use middle::typeck::infer::sub::Sub;
7777
use middle::typeck::infer::to_str::InferStr;
7878
use middle::typeck::infer::resolve::try_resolve_tvar_shallow;
79-
use util::common::{indent, indenter};
79+
use util::common::indenter;
8080

81-
use syntax::abi::AbiSet;
82-
use syntax::ast::{m_const, m_imm, m_mutbl};
81+
use syntax::ast::m_imm;
8382
use syntax::ast;
8483

8584
// Note: Coerce is not actually a combiner, in that it does not

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use middle::typeck::infer::{cres, InferCtxt};
2121
use middle::typeck::isr_alist;
2222
use syntax::ast;
2323
use syntax::ast::{Many, Once, extern_fn, impure_fn, m_const, m_imm, m_mutbl};
24-
use syntax::ast::{noreturn, pure_fn, ret_style, return_val, unsafe_fn};
24+
use syntax::ast::{pure_fn, unsafe_fn};
2525
use syntax::ast::{Onceness, purity};
2626
use syntax::abi::AbiSet;
2727
use syntax::codemap::span;

0 commit comments

Comments
 (0)