Merge commit '0969bc6dde001e01e7e1f58c8ccd7750f8a49ae1' into sync_cg_clif-2021-03-29

[rust.git] / compiler / rustc_mir / src / util / mod.rs

diff --git a/compiler/rustc_mir/src/util/mod.rs b/compiler/rustc_mir/src/util/mod.rs
index aaee0bc526db5511defa5660d57f1dd7aa2d3501..b7b702431bc2a9a0d050e9d0a6556af3412851bf 100644 (file)
--- a/compiler/rustc_mir/src/util/mod.rs
+++ b/compiler/rustc_mir/src/util/mod.rs
@@ -7,6 +7,7 @@
 mod alignment;
 pub mod collect_writes;
 mod find_self_call;
+mod generic_graph;
 pub(crate) mod generic_graphviz;
 mod graphviz;
 pub(crate) mod pretty;
@@ -15,6 +16,6 @@
 pub use self::aggregate::expand_aggregate;
 pub use self::alignment::is_disaligned;
 pub use self::find_self_call::find_self_call;
-pub use self::graphviz::write_node_label as write_graphviz_node_label;
-pub use self::graphviz::{graphviz_safe_def_name, write_mir_graphviz};
+pub use self::generic_graph::graphviz_safe_def_name;
+pub use self::graphviz::write_mir_graphviz;
 pub use self::pretty::{dump_enabled, dump_mir, write_mir_pretty, PassWhere};