From: bors <bors@rust-lang.org>
Date: Mon, 1 Aug 2016 15:57:32 +0000 (-0700)
Subject: Auto merge of #35163 - sanxiyn:rollup, r=sanxiyn
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=28ce3e8a55b21a285f7075612d140a44b42eb889;p=rust.git

Auto merge of #35163 - sanxiyn:rollup, r=sanxiyn

Rollup of 8 pull requests

- Successful merges: #34802, #35033, #35085, #35114, #35134, #35140, #35141, #35157
- Failed merges:
---

28ce3e8a55b21a285f7075612d140a44b42eb889
diff --cc src/librustc_trans/context.rs
index 792169b08a4,5923f407df7..5a3c1c8512a
--- a/src/librustc_trans/context.rs
+++ b/src/librustc_trans/context.rs
@@@ -34,10 -34,9 +34,10 @@@ use rustc::ty::subst::{Substs, VecPerPa
  use rustc::ty::{self, Ty, TyCtxt};
  use session::config::NoDebugInfo;
  use session::Session;
 +use session::config;
  use symbol_map::SymbolMap;
  use util::sha2::Sha256;
- use util::nodemap::{NodeMap, NodeSet, DefIdMap, FnvHashMap, FnvHashSet};
+ use util::nodemap::{NodeSet, DefIdMap, FnvHashMap, FnvHashSet};
  
  use std::ffi::{CStr, CString};
  use std::cell::{Cell, RefCell};