diff options
| -rw-r--r-- | src/librustc/traits/mod.rs | 3 | ||||
| -rw-r--r-- | src/librustc/traits/util.rs | 3 | ||||
| -rw-r--r-- | src/librustc_typeck/astconv.rs | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs index b259ee011da..8d91132a6db 100644 --- a/src/librustc/traits/mod.rs +++ b/src/librustc/traits/mod.rs @@ -44,6 +44,9 @@ use ty::error::{ExpectedFound, TypeError}; use ty::fold::{TypeFolder, TypeFoldable, TypeVisitor}; use util::common::ErrorReported; +use std::fmt::Debug; +use std::rc::Rc; + pub use self::SelectionError::*; pub use self::FulfillmentErrorCode::*; pub use self::Vtable::*; diff --git a/src/librustc/traits/util.rs b/src/librustc/traits/util.rs index 80d8a1d6e5c..48db72c1f56 100644 --- a/src/librustc/traits/util.rs +++ b/src/librustc/traits/util.rs @@ -8,11 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use hir; use hir::def_id::DefId; use traits::specialize::specialization_graph::NodeItem; use ty::{self, Ty, TyCtxt, ToPredicate, ToPolyTraitRef}; use ty::outlives::Component; -use ty::subst::{Kind, Subst}; +use ty::subst::{Kind, Subst, Substs}; use util::nodemap::FxHashSet; use super::{Obligation, ObligationCause, PredicateObligation, SelectionContext, Normalized}; diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index fc151d51d37..5e05f7d8fce 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -1277,7 +1277,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx> + 'o { // item is declared. let bound = match (&ty.sty, ty_path_def) { (_, Def::SelfTy(Some(_), Some(impl_def_id))) => { - // `Self` in an impl of a trait - we have a concrete `self` type and a + // `Self` in an impl of a trait -- we have a concrete `self` type and a // trait reference. let trait_ref = match tcx.impl_trait_ref(impl_def_id) { Some(trait_ref) => trait_ref, |