From e6e4f52bcf67e78bc0c796cd780fa01791923fdb Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Wed, 10 Jul 2013 22:08:50 -0700 Subject: [PATCH 1/3] remove unused imports --- src/librustc/middle/trans/base.rs | 1 - src/librustc/middle/trans/callee.rs | 1 - src/librustc/middle/trans/context.rs | 1 - src/librustc/middle/trans/datum.rs | 1 - src/librustc/middle/trans/glue.rs | 1 - src/librustc/middle/trans/uniq.rs | 1 - src/libstd/vec.rs | 4 +++- 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 2fc502568a8f2..881264f57a421 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -59,7 +59,6 @@ use middle::trans::type_of::*; use middle::ty; use util::common::indenter; use util::ppaux::{Repr, ty_to_str}; -use middle::pat_util; use middle::trans::type_::Type; diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs index 22adc4aa24b65..9b286adf8e9d7 100644 --- a/src/librustc/middle/trans/callee.rs +++ b/src/librustc/middle/trans/callee.rs @@ -20,7 +20,6 @@ use std::vec; use back::abi; use driver::session; -use lib; use lib::llvm::ValueRef; use lib::llvm::llvm; use metadata::csearch; diff --git a/src/librustc/middle/trans/context.rs b/src/librustc/middle/trans/context.rs index 2880c68c1e036..2f18aeb162451 100644 --- a/src/librustc/middle/trans/context.rs +++ b/src/librustc/middle/trans/context.rs @@ -29,7 +29,6 @@ use std::hash; use std::hashmap::{HashMap, HashSet}; use std::str; use std::local_data; -use extra::time; use syntax::ast; use middle::trans::common::{mono_id,ExternMap,tydesc_info,BuilderRef_res,Stats}; diff --git a/src/librustc/middle/trans/datum.rs b/src/librustc/middle/trans/datum.rs index 1de619433afbd..591e318c7314f 100644 --- a/src/librustc/middle/trans/datum.rs +++ b/src/librustc/middle/trans/datum.rs @@ -100,7 +100,6 @@ use middle::trans::glue; use middle::trans::tvec; use middle::trans::type_of; use middle::trans::write_guard; -use middle::trans::type_::Type; use middle::ty; use util::common::indenter; use util::ppaux::ty_to_str; diff --git a/src/librustc/middle/trans/glue.rs b/src/librustc/middle/trans/glue.rs index 25e73fd640d43..b6f226683df9f 100644 --- a/src/librustc/middle/trans/glue.rs +++ b/src/librustc/middle/trans/glue.rs @@ -39,7 +39,6 @@ use middle::trans::type_::Type; use std::io; use std::libc::c_uint; use std::str; -use extra::time; use syntax::ast; pub fn trans_free(cx: block, v: ValueRef) -> block { diff --git a/src/librustc/middle/trans/uniq.rs b/src/librustc/middle/trans/uniq.rs index df9e29cad7f78..7e4554357c949 100644 --- a/src/librustc/middle/trans/uniq.rs +++ b/src/librustc/middle/trans/uniq.rs @@ -19,7 +19,6 @@ use middle::trans::glue; use middle::ty; use middle::trans::machine::llsize_of; use middle::trans::type_of; -use middle::trans::type_of::*; pub fn make_free_glue(bcx: block, vptrptr: ValueRef, box_ty: ty::t) -> block { diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 825dc4cc187d8..22ac1287ed8d5 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -26,7 +26,9 @@ use option::{None, Option, Some}; use ptr::to_unsafe_ptr; use ptr; use ptr::RawPtr; -use rt::global_heap::{malloc_raw, realloc_raw}; +#[cfg(not(stage0))] +use rt::global_heap::malloc_raw; +use rt::global_heap::realloc_raw; use sys; use sys::size_of; use uint; From 202fcb29bd364bb2781928fef4551f0ac37e8e84 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Wed, 10 Jul 2013 22:12:30 -0700 Subject: [PATCH 2/3] unnecessarily mutable variables --- src/librustc/middle/trans/controlflow.rs | 2 +- src/librustc/middle/trans/meth.rs | 2 +- src/libsyntax/parse/parser.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librustc/middle/trans/controlflow.rs b/src/librustc/middle/trans/controlflow.rs index 904e6e14e28db..36ef4edce1e68 100644 --- a/src/librustc/middle/trans/controlflow.rs +++ b/src/librustc/middle/trans/controlflow.rs @@ -248,7 +248,7 @@ pub fn trans_break_cont(bcx: block, let mut unwind = bcx; let mut cur_scope = unwind.scope; let mut target = unwind; - let mut quit = false; + let quit = false; loop { cur_scope = match cur_scope { Some(@scope_info { diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs index 0914e61d58f33..fed8c5e800e84 100644 --- a/src/librustc/middle/trans/meth.rs +++ b/src/librustc/middle/trans/meth.rs @@ -548,7 +548,7 @@ pub fn trans_trait_callee_from_llval(bcx: block, let _icx = push_ctxt("impl::trans_trait_callee"); let ccx = bcx.ccx(); - let mut bcx = bcx; + let bcx = bcx; // Load the vtable from the @Trait pair debug!("(translating trait callee) loading vtable from pair %s", diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 114a8bf9d3d22..05dda16214a8f 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1074,7 +1074,7 @@ impl Parser { // This version of parse arg doesn't necessarily require // identifier names. pub fn parse_arg_general(&self, require_name: bool) -> arg { - let mut is_mutbl = self.eat_keyword(keywords::Mut); + let is_mutbl = self.eat_keyword(keywords::Mut); let pat = if require_name || self.is_named_argument() { self.parse_arg_mode(); let pat = self.parse_pat(); From 990dc435aaf4861c6c57d2f94e3964b6c0918a87 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Wed, 10 Jul 2013 22:23:09 -0700 Subject: [PATCH 3/3] unused variable --- src/librustc/middle/trans/controlflow.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/librustc/middle/trans/controlflow.rs b/src/librustc/middle/trans/controlflow.rs index 36ef4edce1e68..6cbd6304847e3 100644 --- a/src/librustc/middle/trans/controlflow.rs +++ b/src/librustc/middle/trans/controlflow.rs @@ -248,7 +248,6 @@ pub fn trans_break_cont(bcx: block, let mut unwind = bcx; let mut cur_scope = unwind.scope; let mut target = unwind; - let quit = false; loop { cur_scope = match cur_scope { Some(@scope_info {