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:

diff --cc src/librustc_trans/context.rs
index 792169b08a4c677b7918da435af28f975f2cfc15,5923f407df7570f555d6207b36a25d52d7c14ad5..5a3c1c8512ad4c3efb9a6ada3f2d9d401c1231d3
--- 1/src/librustc_trans/context.rs
--- 2/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};

diff --cc src/librustc_trans/debuginfo/metadata.rs
Simple merge

diff --cc src/librustc_trans/debuginfo/mod.rs
Simple merge