Remove usage of global variable "inlined_types"

[rust.git] / src / librustc_typeck / structured_errors.rs

diff --git a/src/librustc_typeck/structured_errors.rs b/src/librustc_typeck/structured_errors.rs
index c8e5a635c15cb6bebf93790c6757491713378348..068814723f52d758e6a578062a5e6887f90c5db1 100644 (file)
--- a/src/librustc_typeck/structured_errors.rs
+++ b/src/librustc_typeck/structured_errors.rs
@@ -1,7 +1,7 @@
-use errors::{Applicability, DiagnosticBuilder, DiagnosticId};
 use rustc::session::Session;
 use rustc::ty::{Ty, TypeFoldable};
-use syntax_pos::Span;
+use rustc_errors::{Applicability, DiagnosticBuilder, DiagnosticId};
+use rustc_span::Span;
 
 use rustc_error_codes::*;
 
@@ -50,8 +50,7 @@ fn session(&self) -> &Session {
     }
 
     fn code(&self) -> DiagnosticId {
-        syntax::diagnostic_used!(E0617);
-        DiagnosticId::Error("E0617".to_owned())
+        rustc_errors::error_code!(E0617)
     }
 
     fn common(&self) -> DiagnosticBuilder<'tcx> {
@@ -112,8 +111,7 @@ fn session(&self) -> &Session {
     }
 
     fn code(&self) -> DiagnosticId {
-        syntax::diagnostic_used!(E0607);
-        DiagnosticId::Error("E0607".to_owned())
+        rustc_errors::error_code!(E0607)
     }
 
     fn common(&self) -> DiagnosticBuilder<'tcx> {