Rollup merge of #68727 - xfix:remove-comment-about-pretty-printer-in-format-tests...

[rust.git] / src / librustc_typeck / constrained_generic_params.rs

diff --git a/src/librustc_typeck/constrained_generic_params.rs b/src/librustc_typeck/constrained_generic_params.rs
index 97a0c226e4d5bd07c6f3d7f6a6c22046f92a0c9a..9b187d461cdeb05e2a4dde7d14de57fd175d1bc8 100644 (file)
--- a/src/librustc_typeck/constrained_generic_params.rs
+++ b/src/librustc_typeck/constrained_generic_params.rs
@@ -1,7 +1,7 @@
 use rustc::ty::fold::{TypeFoldable, TypeVisitor};
 use rustc::ty::{self, Ty, TyCtxt};
-use rustc::util::nodemap::FxHashSet;
-use syntax::source_map::Span;
+use rustc_data_structures::fx::FxHashSet;
+use rustc_span::source_map::Span;
 
 #[derive(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct Parameter(pub u32);
@@ -181,7 +181,7 @@ pub fn setup_constraining_predicates<'tcx>(
                 // to project out an associated type defined by this very
                 // trait.
                 let unbound_trait_ref = projection.projection_ty.trait_ref(tcx);
-                if Some(unbound_trait_ref.clone()) == impl_trait_ref {
+                if Some(unbound_trait_ref) == impl_trait_ref {
                     continue;
                 }