Rollup merge of #69607 - GuillaumeGomez:cleanup-e0376, r=Dylan-DPC

[rust.git] / src / librustc_mir / util / pretty.rs

diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
index a3f85238f472e61fce215c29257bffc9f64709a9..6fd8f06fe8f25c4ba35ec39ea4cf8b892dc3ec49 100644 (file)
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -1,10 +1,10 @@
 use super::graphviz::write_mir_fn_graphviz;
 use crate::transform::MirSource;
-use rustc::hir::def_id::{DefId, LOCAL_CRATE};
 use rustc::mir::visit::Visitor;
 use rustc::mir::*;
 use rustc::ty::{self, TyCtxt};
 use rustc_data_structures::fx::FxHashMap;
+use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_index::vec::Idx;
 use std::fmt::Display;
 use std::fmt::Write as _;
@@ -477,7 +477,7 @@ fn write_scope_tree(
         indented_decl.push_str(";");
 
         let local_name =
-            if local == RETURN_PLACE { format!(" return place") } else { String::new() };
+            if local == RETURN_PLACE { " return place".to_string() } else { String::new() };
 
         writeln!(
             w,
@@ -540,7 +540,7 @@ fn write_mir_sig(
     body: &Body<'_>,
     w: &mut dyn Write,
 ) -> io::Result<()> {
-    use rustc::hir::def::DefKind;
+    use rustc_hir::def::DefKind;
 
     trace!("write_mir_sig: {:?}", src.instance);
     let kind = tcx.def_kind(src.def_id());