Auto merge of #68034 - Centril:rollup-3d9pq14, r=Centril

[rust.git] / src / librustc_driver / pretty.rs

diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs
index 87ce637c6f5c438d491ec53555036a7c0b4e7f06..8804a05b596ee1fa421ac6f6aaa97ff5614f05c7 100644 (file)
--- a/src/librustc_driver/pretty.rs
+++ b/src/librustc_driver/pretty.rs
@@ -1,18 +1,18 @@
 //! The various pretty-printing routines.
 
-use rustc::hir;
-use rustc::hir::def_id::LOCAL_CRATE;
 use rustc::hir::map as hir_map;
-use rustc::hir::print as pprust_hir;
 use rustc::session::config::{Input, PpMode, PpSourceMode};
 use rustc::session::Session;
 use rustc::ty::{self, TyCtxt};
 use rustc::util::common::ErrorReported;
+use rustc_hir as hir;
+use rustc_hir::def_id::LOCAL_CRATE;
+use rustc_hir::print as pprust_hir;
 use rustc_mir::util::{write_mir_graphviz, write_mir_pretty};
 
+use rustc_span::FileName;
 use syntax::ast;
 use syntax::print::pprust;
-use syntax_pos::FileName;
 
 use std::cell::Cell;
 use std::fs::File;
@@ -298,7 +298,7 @@ fn post(&self, s: &mut pprust::State<'_>, node: pprust::AnnNode<'_>) {
             pprust::AnnNode::Crate(_) => {
                 s.s.hardbreak();
                 let verbose = self.sess.verbose();
-                s.synth_comment(syntax_pos::hygiene::debug_hygiene_data(verbose));
+                s.synth_comment(rustc_span::hygiene::debug_hygiene_data(verbose));
                 s.s.hardbreak_if_not_bol();
             }
             _ => {}