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

Conversation

frewsxcv
Copy link
Member

Rebased version of #40097.

Tracking issue: #29864.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv frewsxcv mentioned this pull request Apr 15, 2017
Closed
@frewsxcv frewsxcv force-pushed the sg-implement-rfc-1268 branch from fd5d164 to 075b4ab Compare April 15, 2017 00:41
@frewsxcv
Copy link
Member Author

frewsxcv commented Apr 15, 2017 •
edited
Loading

Considering @nikomatsakis already approved #40097 and all I did was rebase and add an unstable book entry, I hope I'm not overstepping my bounds just to do:

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 15, 2017

📌 Commit 075b4ab has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 15, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Apr 15, 2017

📌 Commit 075b4ab has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 15, 2017

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Apr 15, 2017

☔ The latest upstream changes (presumably #41305) made this pull request unmergeable. Please resolve the merge conflicts.

sgrif and others added 7 commits April 14, 2017 22:04
@sgrif @frewsxcv
Implement RFC 1268
4aca540 
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
Update with response to feedback
ddcca79
@sgrif @frewsxcv
Further update with response to feedback
c81c958
@sgrif @frewsxcv
Put overlapping impls behind feature gate, add tests
adcdd60 
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
Name files what tidy wants them to be namd
5a9c25b
@nikomatsakis @frewsxcv
update tests slightly
805704c
@frewsxcv
Add Unstable Book entry for 'overlapping-marker-traits'.
ae9f571
@frewsxcv frewsxcv force-pushed the sg-implement-rfc-1268 branch from 075b4ab to ae9f571 Compare April 15, 2017 02:05
@frewsxcv
Copy link
Member Author

Rebased.

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 15, 2017

📌 Commit ae9f571 has been approved by nikomatsakis

@frewsxcv frewsxcv mentioned this pull request Apr 15, 2017
Merged
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 15, 2017
@frewsxcv
Rollup merge of rust-lang#41309 - frewsxcv:sg-implement-rfc-1268, r=n…
3adcd1c 
…ikomatsakis

Implement RFC 1268.

Rebased version of rust-lang#40097.

Tracking issue: rust-lang#29864.
bors added a commit that referenced this pull request Apr 15, 2017
@bors
Auto merge of #41312 - frewsxcv:rollup, r=frewsxcv
be1a74e 
Rollup of 2 pull requests

- Successful merges: #41125, #41309
- Failed merges:
@bors
Copy link
Contributor

bors commented Apr 15, 2017

⌛ Testing commit ae9f571 with merge be1a74e...

@bors bors merged commit ae9f571 into rust-lang:master Apr 15, 2017
@frewsxcv frewsxcv mentioned this pull request Apr 15, 2017
Open
6 tasks
@petrochenkov petrochenkov changed the title Implement RFC 1268. Implement RFC 1268 "Allow overlapping implementations for marker traits" Apr 15, 2017
@petrochenkov
Copy link
Contributor

[meta] I've edited the PR name to include the RFC name.
Maybe CONTRIBUTING.md should tell people not to name PRs like "Fix #12345", but I'm not sure anybody reads it :(

@nikomatsakis
Copy link
Contributor

@frewsxcv thanks for adding the book entry! I've been hoping to get to that.

@frewsxcv frewsxcv deleted the sg-implement-rfc-1268 branch April 18, 2017 14:49
@Centril Centril added the F-marker_trait_attr `#![feature(marker_trait_attr)]` label Jan 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@eddyb eddyb

Labels
F-marker_trait_attr `#![feature(marker_trait_attr)]`
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@frewsxcv @rust-highfive @bors @petrochenkov @nikomatsakis @eddyb @Centril @sgrif