Merge branch 'master' into feature/incorporate-tracing

diff --cc src/librustc_builtin_macros/test.rs
Simple merge

diff --cc src/librustc_builtin_macros/test_harness.rs
index 3f7128d605d2544686b9ac00e04e5b7e936768dc,b21a7c1e4d572f3314035cc0c029a688e410d2a1..a80763d6ec8e8d0439e80b39ca0a487312772807
--- 1/src/librustc_builtin_macros/test_harness.rs
--- 2/src/librustc_builtin_macros/test_harness.rs
+++ b/src/librustc_builtin_macros/test_harness.rs
@@@ -1,8 -1,9 +1,8 @@@
  // Code that generates a test runner to run all the tests in a crate
  
 -use log::debug;
  use rustc_ast::ast;
  use rustc_ast::attr;
- use rustc_ast::entry::{self, EntryPointType};
+ use rustc_ast::entry::EntryPointType;
  use rustc_ast::mut_visit::{ExpectOne, *};
  use rustc_ast::ptr::P;
  use rustc_expand::base::{ExtCtxt, ResolverExpand};

diff --cc src/librustc_codegen_llvm/consts.rs
Simple merge

diff --cc src/librustc_codegen_llvm/coverageinfo/mapgen.rs
index 5d1bfd810b2fea3bcfdd06bd2a8913bb9c5bedb1,b50b3b6d975c5e3daf144ea8d719d580f98fdbee..a39234c0b7f66cecdb1ad820451583d3cfd9d050
--- 1/src/librustc_codegen_llvm/coverageinfo/mapgen.rs
--- 2/src/librustc_codegen_llvm/coverageinfo/mapgen.rs
+++ b/src/librustc_codegen_llvm/coverageinfo/mapgen.rs
@@@ -3,11 -3,11 +3,11 @@@ use crate::coverageinfo
  use crate::llvm;
  
  use llvm::coverageinfo::CounterMappingRegion;
 -use log::debug;
  use rustc_codegen_ssa::coverageinfo::map::{Counter, CounterExpression, Region};
  use rustc_codegen_ssa::traits::{BaseTypeMethods, ConstMethods};
- use rustc_data_structures::fx::FxHashMap;
+ use rustc_data_structures::fx::FxIndexSet;
  use rustc_llvm::RustString;
 +use tracing::debug;
  
  use std::ffi::CString;
  

diff --cc src/librustc_codegen_llvm/coverageinfo/mod.rs
Simple merge

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

diff --cc src/librustc_data_structures/Cargo.toml
index 386096b416fb7c89d4b54908867fb16b64ba07a6,d0dbad5d2afe599658ec47b274745af867c5532f..fda0fc5973bef3498447d8ed99bd714d53bd4e5e
--- 1/src/librustc_data_structures/Cargo.toml
--- 2/src/librustc_data_structures/Cargo.toml
+++ b/src/librustc_data_structures/Cargo.toml
@@@ -11,8 -11,8 +11,8 @@@ doctest = fals
  
  [dependencies]
  ena = "0.14"
- indexmap = "1"
+ indexmap = "1.5.1"
 -log = { package = "tracing", version = "0.1" }
 +tracing = "0.1"
  jobserver_crate = { version = "0.1.13", package = "jobserver" }
  lazy_static = "1"
  once_cell = { version = "1", features = ["parking_lot"] }