Rename traits::ImplSourceImpl to ImplSourceUserDefined.

2 files changed, 20 insertions, 18 deletions

diff --git a/src/librustc_middle/traits/mod.rs b/src/librustc_middle/traits/mod.rs
index 16545a19732..56787304d4e 100644
--- a/src/librustc_middle/traits/mod.rs
+++ b/src/librustc_middle/traits/mod.rs
@@ -374,11 +374,11 @@ pub type SelectionResult<'tcx, T> = Result<Option<T>, SelectionError<'tcx>>;
 ///
 /// ### The type parameter `N`
 ///
-/// See explanation on `ImplSourceImplData`.
+/// See explanation on `ImplSourceUserDefinedData`.
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, HashStable, TypeFoldable)]
 pub enum ImplSource<'tcx, N> {
     /// ImplSource identifying a particular impl.
-    ImplSourceImpl(ImplSourceImplData<'tcx, N>),
+    ImplSourceUserDefined(ImplSourceUserDefinedData<'tcx, N>),
 
     /// ImplSource for auto trait implementations.
     /// This carries the information and nested obligations with regards
@@ -399,7 +399,7 @@ pub enum ImplSource<'tcx, N> {
     ImplSourceBuiltin(ImplSourceBuiltinData<N>),
 
     /// ImplSource automatically generated for a closure. The `DefId` is the ID
-    /// of the closure expression. This is a `ImplSourceImpl` in spirit, but the
+    /// of the closure expression. This is a `ImplSourceUserDefined` in spirit, but the
     /// impl is generated by the compiler and does not appear in the source.
     ImplSourceClosure(ImplSourceClosureData<'tcx, N>),
 
@@ -419,7 +419,7 @@ pub enum ImplSource<'tcx, N> {
 impl<'tcx, N> ImplSource<'tcx, N> {
     pub fn nested_obligations(self) -> Vec<N> {
         match self {
-            ImplSourceImpl(i) => i.nested,
+            ImplSourceUserDefined(i) => i.nested,
             ImplSourceParam(n) => n,
             ImplSourceBuiltin(i) => i.nested,
             ImplSourceAutoImpl(d) => d.nested,
@@ -434,7 +434,7 @@ impl<'tcx, N> ImplSource<'tcx, N> {
 
     pub fn borrow_nested_obligations(&self) -> &[N] {
         match &self {
-            ImplSourceImpl(i) => &i.nested[..],
+            ImplSourceUserDefined(i) => &i.nested[..],
             ImplSourceParam(n) => &n[..],
             ImplSourceBuiltin(i) => &i.nested[..],
             ImplSourceAutoImpl(d) => &d.nested[..],
@@ -452,7 +452,7 @@ impl<'tcx, N> ImplSource<'tcx, N> {
         F: FnMut(N) -> M,
     {
         match self {
-            ImplSourceImpl(i) => ImplSourceImpl(ImplSourceImplData {
+            ImplSourceUserDefined(i) => ImplSourceUserDefined(ImplSourceUserDefinedData {
                 impl_def_id: i.impl_def_id,
                 substs: i.substs,
                 nested: i.nested.into_iter().map(f).collect(),
@@ -507,7 +507,7 @@ impl<'tcx, N> ImplSource<'tcx, N> {
 /// is `()`, because codegen only requires a shallow resolution of an
 /// impl, and nested obligations are satisfied later.
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, HashStable, TypeFoldable)]
-pub struct ImplSourceImplData<'tcx, N> {
+pub struct ImplSourceUserDefinedData<'tcx, N> {
     pub impl_def_id: DefId,
     pub substs: SubstsRef<'tcx>,
     pub nested: Vec<N>,
diff --git a/src/librustc_middle/traits/structural_impls.rs b/src/librustc_middle/traits/structural_impls.rs
index 50ecf677dea..218bb144469 100644
--- a/src/librustc_middle/traits/structural_impls.rs
+++ b/src/librustc_middle/traits/structural_impls.rs
@@ -9,7 +9,7 @@ use std::rc::Rc;
 impl<'tcx, N: fmt::Debug> fmt::Debug for traits::ImplSource<'tcx, N> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
-            super::ImplSourceImpl(ref v) => write!(f, "{:?}", v),
+            super::ImplSourceUserDefined(ref v) => write!(f, "{:?}", v),
 
             super::ImplSourceAutoImpl(ref t) => write!(f, "{:?}", t),
 
@@ -32,11 +32,11 @@ impl<'tcx, N: fmt::Debug> fmt::Debug for traits::ImplSource<'tcx, N> {
     }
 }
 
-impl<'tcx, N: fmt::Debug> fmt::Debug for traits::ImplSourceImplData<'tcx, N> {
+impl<'tcx, N: fmt::Debug> fmt::Debug for traits::ImplSourceUserDefinedData<'tcx, N> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "ImplSourceImplData(impl_def_id={:?}, substs={:?}, nested={:?})",
+            "ImplSourceUserDefinedData(impl_def_id={:?}, substs={:?}, nested={:?})",
             self.impl_def_id, self.substs, self.nested
         )
     }
@@ -245,15 +245,17 @@ impl<'a, 'tcx> Lift<'tcx> for traits::ImplSource<'a, ()> {
     type Lifted = traits::ImplSource<'tcx, ()>;
     fn lift_to_tcx(&self, tcx: TyCtxt<'tcx>) -> Option<Self::Lifted> {
         match self.clone() {
-            traits::ImplSourceImpl(traits::ImplSourceImplData { impl_def_id, substs, nested }) => {
-                tcx.lift(&substs).map(|substs| {
-                    traits::ImplSourceImpl(traits::ImplSourceImplData {
-                        impl_def_id,
-                        substs,
-                        nested,
-                    })
+            traits::ImplSourceUserDefined(traits::ImplSourceUserDefinedData {
+                impl_def_id,
+                substs,
+                nested,
+            }) => tcx.lift(&substs).map(|substs| {
+                traits::ImplSourceUserDefined(traits::ImplSourceUserDefinedData {
+                    impl_def_id,
+                    substs,
+                    nested,
                 })
-            }
+            }),
             traits::ImplSourceAutoImpl(t) => Some(traits::ImplSourceAutoImpl(t)),
             traits::ImplSourceGenerator(traits::ImplSourceGeneratorData {
                 generator_def_id,