Remove the overlapping_marker_traits feature
#68544
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @estebank (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
estebank
reviewed
Jan 26, 2020
Centril
reviewed
Jan 26, 2020
Centril
reviewed
Jan 26, 2020
src/librustc/arena.rs
Outdated
| @@ -216,6 +216,9 @@ arena_types!(declare_arena, [], 'tcx); | |||
|
|
|||
| arena_types!(impl_arena_allocatable, [], 'tcx); | |||
|
|
|||
| // Needed until #68057 makes it way into the bootrap compiler, | |||
| // as librustc is affected by the bug that it fixes | |||
| #[cfg_attr(not(bootstrap), marker)] | |||
There was a problem hiding this comment.
It's possible that the new bootstrap compiler is here before this PR merges. If so, this will need to be updated.
taiki-e
reviewed
Jan 27, 2020
|
@Aaron1011 can you squash the commits? r=me after that. |
Aaron1011
force-pushed
the
remove-overlapping-traits
branch
2 times, most recently
from
32053da
to
1b2a4bf
Compare
|
@estebank: Squashed |
|
@estebank: Are there any other changes that you'd like me to make? |
|
I am r=me on the code changes, but would like to CC @rust-lang/compiler so that they are aware as I am not 100% sure I am aware of all the consequences that removing a feature in this way will have on the wider ecosystem. |
See rust-lang#29864 This has been replaced by `#[feature(marker_trait_attr)]` A few notes: * Due to PR rust-lang#68057 not yet being in the bootstrap compiler, it's necessary to continue using `#![feature(overlapping_marker_traits)]` under `#[cfg(bootstrap)]` to work around type inference issues. * I've updated tests that used `overlapping_marker_traits` to now use `marker_trait_attr` where applicable The test `src/test/ui/overlap-marker-trait.rs` doesn't make any sense now that `overlapping_marker_traits`, so I removed it. The test `src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs` now fails, since it's no longer possible to have multiple overlapping negative impls of `Send`. I believe that this is the behavior we want (assuming that `Send` is not going to become a `#[marker]` trait, so I renamed the test to `overlap-permitted-for-marker-traits-neg`
Aaron1011
force-pushed
the
remove-overlapping-traits
branch
from
1b2a4bf
to
302f8c9
Compare
|
I've removed the |
|
@bors r+ |
|
📌 Commit 302f8c9 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Feb 4, 2020
Remove the `overlapping_marker_traits` feature See #29864 This has been replaced by `#[feature(marker_trait_attr)]` A few notes: * Due to PR #68057 not yet being in the bootstrap compiler, it's necessary to continue using `#![feature(overlapping_marker_traits)]` under `#[cfg(bootstrap)]` to work around type inference issues. * I've updated tests that used `overlapping_marker_traits` to now use `marker_trait_attr` where applicable The test `src/test/ui/overlap-marker-trait.rs` doesn't make any sense now that `overlapping_marker_traits`, so I removed it. The test `src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs` now fails, since it's no longer possible to have multiple overlapping negative impls of `Send`. I believe that this is the behavior we want (assuming that `Send` is not going to become a `#[marker]` trait, so I renamed the test to `overlap-permitted-for-marker-traits-neg`
|
☀️ Test successful - checks-azure |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #29864
This has been replaced by
#[feature(marker_trait_attr)]A few notes:
necessary to continue using
#![feature(overlapping_marker_traits)]under
#[cfg(bootstrap)]to work around type inference issues.overlapping_marker_traitsto now usemarker_trait_attrwhere applicableThe test
src/test/ui/overlap-marker-trait.rsdoesn't make any sensenow that
overlapping_marker_traits, so I removed it.The test
src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rsnow fails, since it's no longer possible to have multiple overlapping
negative impls of
Send. I believe that this is the behavior we want(assuming that
Sendis not going to become a#[marker]trait, so Irenamed the test to
overlap-permitted-for-marker-traits-neg