auto merge of #8462 : thestinger/rust/loop-cleanup, r=cmr

I missed some of this in e7bb33aed889aebae1b141cdcc2aeeebab1724ee. Hopefully it's all gone now :).

diff --cc src/librustc/middle/trans/base.rs
Simple merge

diff --cc src/librustc/middle/trans/common.rs
Simple merge

diff --cc src/librustc/middle/trans/controlflow.rs
index 2a3003812fe07383533862c4d40ac36d8c9ddff4,f8505b8c35bd6d33e1f7b03d18fd0de6d02cae7c..ed061e66f4194dd0eab1df915f87b7fd188b8312
--- 1/src/librustc/middle/trans/controlflow.rs
--- 2/src/librustc/middle/trans/controlflow.rs
+++ b/src/librustc/middle/trans/controlflow.rs
@@@ -19,8 -19,8 +19,7 @@@ use middle::trans::base::*
  use middle::trans::build::*;
  use middle::trans::callee;
  use middle::trans::common::*;
 -use middle::trans::debuginfo;
  use middle::trans::expr;
- use middle::trans::type_of::*;
  use middle::ty;
  use util::common::indenter;
  use util::ppaux;

diff --cc src/librustc/middle/trans/expr.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/regionck.rs
Simple merge