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

Resolver: A dep is equivalent to one of the things it can resolve to. #6776

Merged
merged 11 commits into from
Apr 2, 2019
Merged

Resolver: A dep is equivalent to one of the things it can resolve to. #6776

merged 11 commits into from
Apr 2, 2019

Commits on Mar 28, 2019

  1. move compatible to a type 

    This makes a O(n^2) loop in the hart of the resolver a O(n) loop,
 but n is small and hashing is not free.
So the main reason to do this is to make the code clearer.
    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    680a4db View commit details
    Browse the repository at this point in the history

  2. pre calculate how far back to back-jump

    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    6bd554f View commit details
    Browse the repository at this point in the history

  3. proptest, do we have more then one conflict that matches? 

    Yes, apparently we do. So I can't do optimizations based on that being unique.
    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    0f1791b View commit details
    Browse the repository at this point in the history

  4. We have more then one conflict that matches, so pick one with the max… 

    … back-jumping.
    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    70c59ef View commit details
    Browse the repository at this point in the history

  5. A dep is equivalent to one of the things it can resolve to. 

    Thus, if all the things it can resolve to have already ben determined
to be conflicting, then we can just say that we conflict with the parent.
    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    fd27ee7 View commit details
    Browse the repository at this point in the history

  6. if we are a descendant of the trigger of the problem. 

    The best generalization of this is to let things bubble up
and let `jumpback_critical_id` figure this out.
    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    a516d5b View commit details
    Browse the repository at this point in the history

  7. rename fuzz tests so they can be run easily

    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    3da71e8 View commit details
    Browse the repository at this point in the history

  8. never use a generalized in an error message

    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    5fea76b View commit details
    Browse the repository at this point in the history

  9. add a type alias for Age and add some comments

    @Eh2406
    Eh2406 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    a979c9b View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2019

  1. one more comment

    @Eh2406
    Eh2406 committed Mar 30, 2019
    Configuration menu
    Copy the full SHA
    1dd8e56 View commit details
    Browse the repository at this point in the history

  2. consistently refer to backtracking instead of jump back, `backjum… 

    …p`, or `jumpback`
    @Eh2406
    Eh2406 committed Mar 30, 2019
    Configuration menu
    Copy the full SHA
    91b5a9d View commit details
    Browse the repository at this point in the history