Skip to content

Commit

Permalink
Rollup merge of rust-lang#87006 - ptrojahn:implsource_vtable, r=jonas…
Browse files Browse the repository at this point in the history
…-schievink

Revert the revert of renaming traits::VTable to ImplSource

As rust-lang#72114 and rust-lang#73055 were merged so closely together I think this
accidentally happened while rebasing
  • Loading branch information
JohnTitor committed Jul 10, 2021
2 parents a84d1b2 + 5cf954f commit 632f84f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions compiler/rustc_middle/src/traits/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 632f84f

Please sign in to comment.