Add some type-alias-impl-trait regression tests

[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 dc6c45b41842c8e9e2655829e8f4870cda10bcbc..99b7b2001a9e9a29812a2ecf8ec6d3ec7da509c2 100644 (file)
--- a/src/librustc_typeck/structured_errors.rs
+++ b/src/librustc_typeck/structured_errors.rs
@@ -1,10 +1,8 @@
-use errors::{Applicability, DiagnosticBuilder, DiagnosticId};
 use rustc::session::Session;
 use rustc::ty::{Ty, TypeFoldable};
+use rustc_errors::{Applicability, DiagnosticBuilder, DiagnosticId};
 use rustc_span::Span;
 
-use rustc_error_codes::*;
-
 pub trait StructuredDiagnostic<'tcx> {
     fn session(&self) -> &Session;
 
@@ -50,7 +48,7 @@ fn session(&self) -> &Session {
     }
 
     fn code(&self) -> DiagnosticId {
-        errors::error_code!(E0617)
+        rustc_errors::error_code!(E0617)
     }
 
     fn common(&self) -> DiagnosticBuilder<'tcx> {
@@ -111,7 +109,7 @@ fn session(&self) -> &Session {
     }
 
     fn code(&self) -> DiagnosticId {
-        errors::error_code!(E0607)
+        rustc_errors::error_code!(E0607)
     }
 
     fn common(&self) -> DiagnosticBuilder<'tcx> {