From 2c3e5d3de023c0bfbf4a4c4d3b0d7a9844e96ffe Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Tue, 31 Dec 2019 21:25:16 +0100
Subject: - remove syntax::{span_warn!, span_err!, span_fatal!. struct_err!} -
 remove syntax::{help!, span_help!, span_note!} - remove unused
 syntax::{struct_span_fatal, struct_span_err_or_warn!, span_err_or_warn!} -
 lintify check_for_bindings_named_same_as_variants + conflicting_repr_hints -
 inline syntax::{struct_span_warn!, diagnostic_used!} - stringify_error_code!
 -> error_code! & use it more. - find_plugin_registrar: de-fatalize an error -
 de-fatalize metadata errors - move type_error_struct! to rustc_typeck -
 struct_span_err! -> rustc_errors

---
 src/librustc_plugin_impl/Cargo.toml | 1 +
 src/librustc_plugin_impl/load.rs    | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/librustc_plugin_impl')

diff --git a/src/librustc_plugin_impl/Cargo.toml b/src/librustc_plugin_impl/Cargo.toml
index 54cceca7d3a..d0b7accafd6 100644
--- a/src/librustc_plugin_impl/Cargo.toml
+++ b/src/librustc_plugin_impl/Cargo.toml
@@ -12,6 +12,7 @@ doctest = false
 
 [dependencies]
 rustc = { path = "../librustc" }
+rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_metadata = { path = "../librustc_metadata" }
 syntax = { path = "../libsyntax" }
diff --git a/src/librustc_plugin_impl/load.rs b/src/librustc_plugin_impl/load.rs
index 2215e49ec97..65661ec24f0 100644
--- a/src/librustc_plugin_impl/load.rs
+++ b/src/librustc_plugin_impl/load.rs
@@ -3,18 +3,17 @@
 use crate::Registry;
 use rustc::middle::cstore::MetadataLoader;
 use rustc::session::Session;
+use rustc_error_codes::*;
+use rustc_errors::struct_span_err;
 use rustc_metadata::locator;
-
 use rustc_span::symbol::sym;
 use rustc_span::Span;
+use syntax::ast::{Crate, Ident};
+
 use std::borrow::ToOwned;
 use std::env;
 use std::mem;
 use std::path::PathBuf;
-use syntax::ast::{Crate, Ident};
-use syntax::struct_span_err;
-
-use rustc_error_codes::*;
 
 /// Pointer to a registrar function.
 type PluginRegistrarFn = fn(&mut Registry<'_>);
-- 
cgit 1.4.1-3-g733a5