]> git.lizzy.rs Git - rust.git/commit
Remove the `overlapping_marker_traits` feature
authorAaron Hill <aa1ronham@gmail.com>
Sat, 25 Jan 2020 20:30:19 +0000 (15:30 -0500)
committerAaron Hill <aa1ronham@gmail.com>
Tue, 4 Feb 2020 18:20:47 +0000 (13:20 -0500)
commit302f8c97ea92d010f39a19563e8881a704c6f136
tree8d51862b1f221c56c07e2257a3af1f28699568c8
parent126ad2b813010447807b0593a80bc6c04962e7ea
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`
16 files changed:
src/librustc/arena.rs
src/librustc/lib.rs
src/librustc/ty/mod.rs
src/librustc_feature/active.rs
src/librustc_feature/removed.rs
src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs
src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
src/test/ui/coherence/coherence-impls-send.rs
src/test/ui/coherence/coherence-impls-send.stderr
src/test/ui/overlap-doesnt-conflict-with-specialization.rs
src/test/ui/overlap-marker-trait.rs [deleted file]
src/test/ui/overlap-marker-trait.stderr [deleted file]
src/test/ui/traits/overlap-not-permitted-for-builtin-trait.rs [new file with mode: 0644]
src/test/ui/traits/overlap-not-permitted-for-builtin-trait.stderr [new file with mode: 0644]
src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs [deleted file]
src/test/ui/traits/overlap-permitted-for-marker-traits.rs [deleted file]