Correct regression in type-inference #27258
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| let upcast_trait_refs: Vec<_> = util::supertraits(self.tcx(), poly_trait_ref).collect(); | ||
|
|
||
| // Find the first one that matches; this is what we are upcasting to. | ||
| let index = |
There was a problem hiding this comment.
nit: I think this iterator salad would actually be clearer as a for-loop
|
r+ modulo nit |
| let mut upcast_trait_ref = None; | ||
| let mut vtable_base = 0; | ||
| // Collect the full set of supertraitrefs. | ||
| let upcast_trait_refs: Vec<_> = util::supertraits(self.tcx(), poly_trait_ref).collect(); |
There was a problem hiding this comment.
Couldn't this be done without collecting?
the object trait matches the required trait during trait selection. The existing code was checking that the object trait WOULD match (in a probe), but never executing the match outside of a probe. This corrects various regressions observed in the wild, including issue rust-lang#26952. Fixes rust-lang#26952.
nikomatsakis
force-pushed
the
issue-26952
branch
from
93e7295 to
4726bb4
Compare
|
@eddyb updated |
| @@ -1898,7 +1898,7 @@ impl<'tcx> PolyTraitRef<'tcx> { | |||
| /// erase, or otherwise "discharge" these bound regions, we change the | |||
| /// type from `Binder<T>` to just `T` (see | |||
| /// e.g. `liberate_late_bound_regions`). | |||
| #[derive(Clone, PartialEq, Eq, Hash, Debug)] | |||
| #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)] | |||
| pub struct Binder<T>(pub T); | |||
There was a problem hiding this comment.
Time to remove a thousand clone calls :P.
@huonw @Manishearth How about a lint against calling .clone() on a Copy type?
|
@bors r+ |
|
📌 Commit 4726bb4 has been approved by |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 24, 2015
Correct regression in type-inference caused by failing to reconfirm that the object trait matches the required trait during trait selection. The existing code was checking that the object trait WOULD match (in a probe), but never executing the match outside of a probe. This corrects various regressions observed in the wild, including issue rust-lang#26952. Fixes rust-lang#26952. r? @eddyb cc @frankmcsherry
bors
added a commit
that referenced
this pull request
Jul 25, 2015
Correct regression in type-inference caused by failing to reconfirm that the object trait matches the required trait during trait selection. The existing code was checking that the object trait WOULD match (in a probe), but never executing the match outside of a probe. This corrects various regressions observed in the wild, including issue #26952. Fixes #26952. r? @eddyb cc @frankmcsherry
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Correct regression in type-inference caused by failing to reconfirm that
the object trait matches the required trait during trait selection. The
existing code was checking that the object trait WOULD match (in a
probe), but never executing the match outside of a probe.
This corrects various regressions observed in the wild, including
issue #26952. Fixes #26952.
r? @eddyb
cc @frankmcsherry