diff options
| author | bors <bors@rust-lang.org> | 2020-02-04 23:56:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-04 23:56:49 +0000 |
| commit | 002287d25f6ef9718dbabd3e23c00b5ebcfb51c1 (patch) | |
| tree | 68ae6b4d841f1b977d04d2a3af3336ac5227b35b /src/test/codegen/src-hash-algorithm | |
| parent | c9290dceee2cb6b882b26ec6e294560e51ef0853 (diff) | |
| parent | 302f8c97ea92d010f39a19563e8881a704c6f136 (diff) | |
| download | rust-002287d25f6ef9718dbabd3e23c00b5ebcfb51c1.tar.gz rust-002287d25f6ef9718dbabd3e23c00b5ebcfb51c1.zip | |
Auto merge of #68544 - Aaron1011:remove-overlapping-traits, r=estebank
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`
Diffstat (limited to 'src/test/codegen/src-hash-algorithm')
0 files changed, 0 insertions, 0 deletions