about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-07-11 01:15:39 +0900
committerGitHub <noreply@github.com>2021-07-11 01:15:39 +0900
commit632f84f4cbb30e17f749a81e0ca542f0e2aa50a8 (patch)
tree9bea9ff680fb3daf7c517873f9d20952fe0b78c0
parenta84d1b21aea9863f0fc5f436b4982d145dade646 (diff)
parent5cf954f932cef4326b09af2b93a9fc8b63f35600 (diff)
downloadrust-632f84f4cbb30e17f749a81e0ca542f0e2aa50a8.tar.gz
rust-632f84f4cbb30e17f749a81e0ca542f0e2aa50a8.zip
Rollup merge of #87006 - ptrojahn:implsource_vtable, r=jonas-schievink
Revert the revert of renaming traits::VTable to ImplSource

As #72114 and #73055 were merged so closely together I think this
accidentally happened while rebasing
-rw-r--r--compiler/rustc_middle/src/traits/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_middle/src/traits/mod.rs b/compiler/rustc_middle/src/traits/mod.rs
index c9b73c68209..892a29e4e22 100644
--- a/compiler/rustc_middle/src/traits/mod.rs
+++ b/compiler/rustc_middle/src/traits/mod.rs
@@ -426,10 +426,10 @@ pub type SelectionResult<'tcx, T> = Result<Option<T>, SelectionError<'tcx>>;
 /// impl Clone for i32 { ... }                   // Impl_3
 ///
 /// fn foo<T: Clone>(concrete: Option<Box<i32>>, param: T, mixed: Option<T>) {
-///     // Case A: Vtable points at a specific impl. Only possible when
+///     // Case A: ImplSource points at a specific impl. Only possible when
 ///     // type is concretely known. If the impl itself has bounded
-///     // type parameters, Vtable will carry resolutions for those as well:
-///     concrete.clone(); // Vtable(Impl_1, [Vtable(Impl_2, [Vtable(Impl_3)])])
+///     // type parameters, ImplSource will carry resolutions for those as well:
+///     concrete.clone(); // ImpleSource(Impl_1, [ImplSource(Impl_2, [ImplSource(Impl_3)])])
 ///
 ///     // Case A: ImplSource points at a specific impl. Only possible when
 ///     // type is concretely known. If the impl itself has bounded