From 8af151b30a31fef48a2173d7cc6aee50baa6d276 Mon Sep 17 00:00:00 2001
From: Mark Mansi <markm@cs.wisc.edu>
Date: Thu, 23 May 2019 12:15:48 -0500
Subject: remove reexport of rustc::ty::Instance

---
 src/librustc_codegen_llvm/debuginfo/mod.rs       | 3 +--
 src/librustc_codegen_llvm/debuginfo/namespace.rs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/librustc_codegen_llvm/debuginfo')

diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs
index 6fa594d4453..548ea0b1036 100644
--- a/src/librustc_codegen_llvm/debuginfo/mod.rs
+++ b/src/librustc_codegen_llvm/debuginfo/mod.rs
@@ -20,9 +20,8 @@ use rustc::ty::subst::{SubstsRef, UnpackedKind};
 use crate::abi::Abi;
 use crate::common::CodegenCx;
 use crate::builder::Builder;
-use crate::monomorphize::Instance;
 use crate::value::Value;
-use rustc::ty::{self, ParamEnv, Ty, InstanceDef};
+use rustc::ty::{self, ParamEnv, Ty, InstanceDef, Instance};
 use rustc::mir;
 use rustc::session::config::{self, DebugInfo};
 use rustc::util::nodemap::{DefIdMap, FxHashMap, FxHashSet};
diff --git a/src/librustc_codegen_llvm/debuginfo/namespace.rs b/src/librustc_codegen_llvm/debuginfo/namespace.rs
index f7c377adf35..c0e8acbbde9 100644
--- a/src/librustc_codegen_llvm/debuginfo/namespace.rs
+++ b/src/librustc_codegen_llvm/debuginfo/namespace.rs
@@ -2,7 +2,6 @@
 
 use super::metadata::{unknown_file_metadata, UNKNOWN_LINE_NUMBER};
 use super::utils::{DIB, debug_context};
-use crate::monomorphize::Instance;
 use rustc::ty;
 
 use crate::llvm;
@@ -10,6 +9,7 @@ use crate::llvm::debuginfo::DIScope;
 use crate::common::CodegenCx;
 use rustc::hir::def_id::DefId;
 use rustc::hir::map::DefPathData;
+use rustc::ty::Instance;
 
 use rustc_data_structures::small_c_str::SmallCStr;
 
-- 
cgit 1.4.1-3-g733a5