Auto merge of #30457 - Manishearth:rollup, r=Manishearth

[rust.git] / src / librustc_front / print / pprust.rs

diff --git a/src/librustc_front/print/pprust.rs b/src/librustc_front/print/pprust.rs
index c4c5b9170f6bf54cf4a85cab28bd77d55451ac6a..9ac0e65cba33b051e841e38f4648dc6c02b2e247 100644 (file)
--- a/src/librustc_front/print/pprust.rs
+++ b/src/librustc_front/print/pprust.rs
@@ -13,7 +13,7 @@
 use syntax::abi;
 use syntax::ast;
 use syntax::codemap::{self, CodeMap, BytePos, Spanned};
-use syntax::diagnostic;
+use syntax::errors;
 use syntax::parse::token::{self, BinOpToken};
 use syntax::parse::lexer::comments;
 use syntax::parse;
@@ -120,7 +120,7 @@ pub fn rust_printer_annotated<'a>(writer: Box<Write + 'a>,
 /// it can scan the input text for comments and literals to
 /// copy forward.
 pub fn print_crate<'a>(cm: &'a CodeMap,
-                       span_diagnostic: &diagnostic::SpanHandler,
+                       span_diagnostic: &errors::Handler,
                        krate: &hir::Crate,
                        filename: String,
                        input: &mut Read,
@@ -141,7 +141,7 @@ pub fn print_crate<'a>(cm: &'a CodeMap,
 
 impl<'a> State<'a> {
     pub fn new_from_input(cm: &'a CodeMap,
-                          span_diagnostic: &diagnostic::SpanHandler,
+                          span_diagnostic: &errors::Handler,
                           filename: String,
                           input: &mut Read,
                           out: Box<Write + 'a>,