Rollup merge of #68050 - Centril:canon-error, r=Mark-Simulacrum

Canonicalize rustc_error imports

r? @Mark-Simulacrum

diff --cc Cargo.lock
Simple merge

diff --cc src/librustc/Cargo.toml
Simple merge

diff --cc src/librustc/dep_graph/graph.rs
index 625aa25978e6eb265afdd588be4bb649d9363a7a,78895340b07c3ab8637ce8c96bf415184f534eda..8d1efc7bc048d8510a514b7029945b4f49ec021b
--- 1/src/librustc/dep_graph/graph.rs
--- 2/src/librustc/dep_graph/graph.rs
+++ b/src/librustc/dep_graph/graph.rs
@@@ -1,8 -1,6 +1,7 @@@
  use crate::ty::{self, TyCtxt};
- use errors::Diagnostic;
  use parking_lot::{Condvar, Mutex};
  use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 +use rustc_data_structures::profiling::QueryInvocationId;
  use rustc_data_structures::sharded::{self, Sharded};
  use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
  use rustc_data_structures::sync::{AtomicU32, AtomicU64, Lock, Lrc, Ordering};

diff --cc src/librustc/ty/query/plumbing.rs
Simple merge

diff --cc src/librustc_lint/builtin.rs
index c8a595267569eeea62a55e6fdbd359e5d418267f,b77dea463f96f577a98c2b95a2d01c9b5b4928e9..25f6361e0507d995ee26edfbd60fab582a95f271
--- 1/src/librustc_lint/builtin.rs
--- 2/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@@ -44,8 -45,8 +45,7 @@@ use rustc_span::symbol::{kw, sym, Symbo
  use rustc_span::{BytePos, Span};
  use syntax::ast::{self, Expr};
  use syntax::attr::{self, HasAttrs};
- use syntax::errors::{Applicability, DiagnosticBuilder};
  use syntax::print::pprust::{self, expr_to_string};
 -use syntax::ptr::P;
  use syntax::tokenstream::{TokenStream, TokenTree};
  use syntax::visit::FnKind;
  

diff --cc src/librustc_passes/ast_validation.rs
Simple merge

diff --cc src/librustc_typeck/astconv.rs
Simple merge

diff --cc src/librustc_typeck/check/method/suggest.rs
Simple merge

diff --cc src/librustc_typeck/check/pat.rs
Simple merge

diff --cc src/libsyntax/feature_gate/check.rs
Simple merge