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

Jump to bottom

Remove contraction from region inference #29188

Merged
merged 8 commits into from
Oct 29, 2015
Merged

Remove contraction from region inference #29188

merged 8 commits into from
Oct 29, 2015

Commits on Oct 28, 2015

  1. do not dump extern def-ids with path for now

    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    60ab57e View commit details
    Browse the repository at this point in the history

  2. Remove contraction. The contraction rules predated the notion of an 

    empty region, and they complicate region inference to no particular end.
They also lead in some cases to spurious errors like rust-lang#29048 (though in
some cases these errors are helpful in tracking down missing
constraints).
    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    41bca6d View commit details
    Browse the repository at this point in the history

  3. Regression test for rust-lang#29048. Fixes rust-lang#29048.

    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    18698c8 View commit details
    Browse the repository at this point in the history

  4. remove SupSupConflict, which is now dead code

    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    6934618 View commit details
    Browse the repository at this point in the history

  5. Don't "double check" var-sub-var constraints, which are handled in 

    expansion already by growing the RHS to be bigger than LHS (all the way
to `'static` if necessary). This is needed because contraction doesn't
handle givens. Fixes rust-lang#28934.
    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    c81ce82 View commit details
    Browse the repository at this point in the history

  6. Update docs for region inference to reflect current state better

    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    9ef2416 View commit details
    Browse the repository at this point in the history

  7. Do some slight refactoring, leave the rest for rust-lang#29436

    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    690206c View commit details
    Browse the repository at this point in the history

  8. Move test file to run-fail, since it does an unwrap

    @nikomatsakis
    nikomatsakis committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    c2277de View commit details
    Browse the repository at this point in the history