Rollup merge of #66059 - RalfJung:panic-on-non-zero, r=eddyb

[rust.git] / src / librustc_ty / common_traits.rs

diff --git a/src/librustc_ty/common_traits.rs b/src/librustc_ty/common_traits.rs
index 9fe8a19311fb67e58a0ce2718048d4aae16608be..e0ce6ad23a650928888f02c1d5f1144ee5ae7699 100644 (file)
--- a/src/librustc_ty/common_traits.rs
+++ b/src/librustc_ty/common_traits.rs
@@ -1,8 +1,9 @@
 //! Queries for checking whether a type implements one of a few common traits.
 
 use rustc::middle::lang_items;
-use rustc::traits;
 use rustc::ty::{self, Ty, TyCtxt};
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits;
 use rustc_span::DUMMY_SP;
 
 fn is_copy_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {