Skip to content

Commit 323ac99

Browse files
committed
auto merge of #7708 : bcully/rust/warnings, r=thestinger
Just getting my feet wet.
2 parents 06accaf + 990dc43 commit 323ac99

File tree

10 files changed

+5
-10
lines changed

10 files changed

+5
-10
lines changed

src/librustc/middle/trans/base.rs

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ use middle::trans::type_of::*;
5959
use middle::ty;
6060
use util::common::indenter;
6161
use util::ppaux::{Repr, ty_to_str};
62-
use middle::pat_util;
6362

6463
use middle::trans::type_::Type;
6564

src/librustc/middle/trans/callee.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use std::vec;
2020

2121
use back::abi;
2222
use driver::session;
23-
use lib;
2423
use lib::llvm::ValueRef;
2524
use lib::llvm::llvm;
2625
use metadata::csearch;

src/librustc/middle/trans/context.rs

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ use std::hash;
2929
use std::hashmap::{HashMap, HashSet};
3030
use std::str;
3131
use std::local_data;
32-
use extra::time;
3332
use syntax::ast;
3433

3534
use middle::trans::common::{mono_id,ExternMap,tydesc_info,BuilderRef_res,Stats};

src/librustc/middle/trans/controlflow.rs

-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ pub fn trans_break_cont(bcx: block,
248248
let mut unwind = bcx;
249249
let mut cur_scope = unwind.scope;
250250
let mut target = unwind;
251-
let mut quit = false;
252251
loop {
253252
cur_scope = match cur_scope {
254253
Some(@scope_info {

src/librustc/middle/trans/datum.rs

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ use middle::trans::glue;
100100
use middle::trans::tvec;
101101
use middle::trans::type_of;
102102
use middle::trans::write_guard;
103-
use middle::trans::type_::Type;
104103
use middle::ty;
105104
use util::common::indenter;
106105
use util::ppaux::ty_to_str;

src/librustc/middle/trans/glue.rs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ use middle::trans::type_::Type;
3939
use std::io;
4040
use std::libc::c_uint;
4141
use std::str;
42-
use extra::time;
4342
use syntax::ast;
4443

4544
pub fn trans_free(cx: block, v: ValueRef) -> block {

src/librustc/middle/trans/meth.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ 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;
551+
let bcx = bcx;
552552

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

src/librustc/middle/trans/uniq.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use middle::trans::glue;
1919
use middle::ty;
2020
use middle::trans::machine::llsize_of;
2121
use middle::trans::type_of;
22-
use middle::trans::type_of::*;
2322

2423
pub fn make_free_glue(bcx: block, vptrptr: ValueRef, box_ty: ty::t)
2524
-> block {

src/libstd/vec.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ use option::{None, Option, Some};
2626
use ptr::to_unsafe_ptr;
2727
use ptr;
2828
use ptr::RawPtr;
29-
use rt::global_heap::{malloc_raw, realloc_raw};
29+
#[cfg(not(stage0))]
30+
use rt::global_heap::malloc_raw;
31+
use rt::global_heap::realloc_raw;
3032
use sys;
3133
use sys::size_of;
3234
use uint;

src/libsyntax/parse/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ impl Parser {
10741074
// This version of parse arg doesn't necessarily require
10751075
// identifier names.
10761076
pub fn parse_arg_general(&self, require_name: bool) -> arg {
1077-
let mut is_mutbl = self.eat_keyword(keywords::Mut);
1077+
let is_mutbl = self.eat_keyword(keywords::Mut);
10781078
let pat = if require_name || self.is_named_argument() {
10791079
self.parse_arg_mode();
10801080
let pat = self.parse_pat();

0 commit comments

Comments
 (0)