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).

diff --cc src/librustc/lint/mod.rs
index 8efce297a9117414117f48afddfd44980e6ed8bf,dc1c9f7c1084423c74f5cb3d922caa3db127bd5a..c16029d33205e6875ad9902aa2f80b285f03b91a
--- 1/src/librustc/lint/mod.rs
--- 2/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;