From: bors <bors@rust-lang.org>
Date: Sat, 21 Jul 2018 10:30:11 +0000 (+0000)
Subject: Auto merge of #52555 - petrochenkov:mresfact, r=alexcrichton
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=ef9781358daa0a70bdaf11c9f792210ea30dd396;p=rust.git

Auto merge of #52555 - petrochenkov:mresfact, r=alexcrichton

resolve: Some renaming, refactoring and comments

Commits are self-descriptive.
The only functional change is https://github.com/rust-lang/rust/commit/34bf2f572e33d4df1459413b5014ca98fc9fa4e0 that tightens shadowing rules for macro paths (makes the second and third cases in `test/ui/imports/glob-shadowing.rs` an error).
---

ef9781358daa0a70bdaf11c9f792210ea30dd396
diff --cc src/librustc/lint/mod.rs
index 8efce297a91,dc1c9f7c108..c16029d3320
--- a/src/librustc/lint/mod.rs
+++ b/src/librustc/lint/mod.rs
@@@ -39,9 -39,9 +39,9 @@@ use hir::intravisit
  use hir;
  use lint::builtin::BuiltinLintDiagnostics;
  use session::{Session, DiagnosticMessageId};
- use std::hash;
+ use std::{hash, ptr};
  use syntax::ast;
 -use syntax::codemap::MultiSpan;
 +use syntax::codemap::{MultiSpan, ExpnFormat};
  use syntax::edition::Edition;
  use syntax::symbol::Symbol;
  use syntax::visit as ast_visit;