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

Implement RFC 1268 "Allow overlapping implementations for marker traits" #41309

Merged
merged 7 commits into from
Apr 15, 2017
Merged

Implement RFC 1268 "Allow overlapping implementations for marker traits" #41309

merged 7 commits into from
Apr 15, 2017

Commits on Apr 15, 2017

  1. Implement RFC 1268 

    This patch allows overlap to occur between any two impls of a trait for
traits which have no associated items.

Several compile-fail tests around coherence had to be changed to add at
least one item to the trait they test against.

Ref rust-lang#29864
    @sgrif @frewsxcv
    sgrif authored and frewsxcv committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    4aca540 View commit details
    Browse the repository at this point in the history

  2. Update with response to feedback

    @sgrif @frewsxcv
    sgrif authored and frewsxcv committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    ddcca79 View commit details
    Browse the repository at this point in the history

  3. Further update with response to feedback

    @sgrif @frewsxcv
    sgrif authored and frewsxcv committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    c81c958 View commit details
    Browse the repository at this point in the history

  4. Put overlapping impls behind feature gate, add tests 

    I've added some explicit tests that negative impls are allowed to
overlap, and also to make sure that the feature doesn't interfere with
specialization. I've not added an explicit test for positive overlapping
with negative, as that's already tested elsewhere.
    @sgrif @frewsxcv
    sgrif authored and frewsxcv committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    adcdd60 View commit details
    Browse the repository at this point in the history

  5. Name files what tidy wants them to be namd

    @sgrif @frewsxcv
    sgrif authored and frewsxcv committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    5a9c25b View commit details
    Browse the repository at this point in the history

  6. update tests slightly

    @nikomatsakis @frewsxcv
    nikomatsakis authored and frewsxcv committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    805704c View commit details
    Browse the repository at this point in the history

  7. Add Unstable Book entry for 'overlapping-marker-traits'.

    @frewsxcv
    frewsxcv committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    ae9f571 View commit details
    Browse the repository at this point in the history