Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle subtyping in inference through obligations #40570

Merged
merged 19 commits into from
Apr 13, 2017
Merged

Handle subtyping in inference through obligations #40570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4a0a0e9
remove type variable defaults code
nikomatsakis Mar 10, 2017
18ea55f
remove bivariance
nikomatsakis Mar 10, 2017
58609ef
add Subtype predicate
nikomatsakis Mar 10, 2017
4e4bdea
propagate sub-obligations better
nikomatsakis Mar 10, 2017
105ec7e
use obligations to propagate sub-typing instead of the TV code
nikomatsakis Mar 10, 2017
e58e2b4
remove the subtyping relations from TypeVariable
nikomatsakis Mar 16, 2017
e4b762b
add regression test for #30225
nikomatsakis Mar 16, 2017
d1033d0
add FIXME to #18653
nikomatsakis Apr 3, 2017
77d9e38
add FIXME for bivariant lub/glb
nikomatsakis Apr 3, 2017
14f1e34
fix a bug in compiletest JSON parsing for duplicate errors
nikomatsakis Apr 11, 2017
3a5bbf8
avoid unneeded subtype obligations in lub/glb
nikomatsakis Apr 11, 2017
bca56e8
generalize type variables too
nikomatsakis Apr 11, 2017
1c138ed
update various test cases that generate slightly different output
nikomatsakis Apr 11, 2017
761808e
just panic in rustdoc if we encounter a subtype predicate
nikomatsakis Apr 11, 2017
59babd8
add some comments and `debug!` calls to "obligation forest"
nikomatsakis Apr 11, 2017
0fae332
add some debug! to coercion
nikomatsakis Apr 11, 2017
7832db8
fix long line
nikomatsakis Apr 11, 2017
fa437f4
do not consult union-find during `fudge_regions_if_ok`
nikomatsakis Apr 12, 2017
1cc7621
simplify code to remove now unused "stack" and fix comments
nikomatsakis Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/librustc/ich/impls_ty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ impl_stable_hash_for!(enum ty::Visibility {
impl_stable_hash_for!(struct ty::TraitRef<'tcx> { def_id, substs });
impl_stable_hash_for!(struct ty::TraitPredicate<'tcx> { trait_ref });
impl_stable_hash_for!(tuple_struct ty::EquatePredicate<'tcx> { t1, t2 });
impl_stable_hash_for!(struct ty::SubtypePredicate<'tcx> { a_is_expected, a, b });

impl<'a, 'tcx, A, B> HashStable<StableHashingContext<'a, 'tcx>> for ty::OutlivesPredicate<A, B>
where A: HashStable<StableHashingContext<'a, 'tcx>>,
Expand Down Expand Up @@ -200,6 +201,9 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a, 'tcx>> for ty::Predicate<'tcx
ty::Predicate::Equate(ref pred) => {
pred.hash_stable(hcx, hasher);
}
ty::Predicate::Subtype(ref pred) => {
pred.hash_stable(hcx, hasher);
}
ty::Predicate::RegionOutlives(ref pred) => {
pred.hash_stable(hcx, hasher);
}
Expand Down
123 changes: 0 additions & 123 deletions src/librustc/infer/bivariate.rs
View file
Open in desktop

This file was deleted.

Loading