Skip to content

Commit 02b5fee

Browse files
leoyvenspetrochenkov
authored andcommitted
Adjust tests for removal of impl Foo for .. {}
1 parent f93183a commit 02b5fee

27 files changed

+29
-168
lines changed

src/libstd/panic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pub use panicking::{take_hook, set_hook, PanicInfo, Location};
101101
#[stable(feature = "catch_unwind", since = "1.9.0")]
102102
#[rustc_on_unimplemented = "the type {Self} may not be safely transferred \
103103
across an unwind boundary"]
104-
pub trait UnwindSafe {}
104+
pub auto trait UnwindSafe {}
105105

106106
/// A marker trait representing types where a shared reference is considered
107107
/// unwind safe.
@@ -115,7 +115,7 @@ pub trait UnwindSafe {}
115115
#[rustc_on_unimplemented = "the type {Self} may contain interior mutability \
116116
and a reference may not be safely transferrable \
117117
across a catch_unwind boundary"]
118-
pub trait RefUnwindSafe {}
118+
pub auto trait RefUnwindSafe {}
119119

120120
/// A simple wrapper around a type to assert that it is unwind safe.
121121
///

src/test/compile-fail/auto-impl-future-compat.rs

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/test/compile-fail/auxiliary/tdticc_coherence_lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#![feature(optin_builtin_traits, core)]
1212
#![crate_type = "rlib"]
1313

14-
pub trait DefaultedTrait { }
15-
#[allow(auto_impl)]
16-
impl DefaultedTrait for .. { }
14+
pub auto trait DefaultedTrait { }
1715

1816
pub struct Something<T> { t: T }

src/test/compile-fail/coherence-default-trait-impl.rs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,18 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
trait MyTrait { fn foo() {} }
13+
auto trait MySafeTrait {}
1414

15-
#[allow(auto_impl)]
16-
impl MyTrait for .. {}
17-
//~^ ERROR redundant auto implementations of trait `MyTrait`
18-
19-
#[allow(auto_impl)]
20-
impl MyTrait for .. {}
21-
22-
trait MySafeTrait {}
15+
struct Foo;
2316

2417
#[allow(auto_impl)]
25-
unsafe impl MySafeTrait for .. {}
18+
unsafe impl MySafeTrait for Foo {}
2619
//~^ ERROR implementing the trait `MySafeTrait` is not unsafe
2720

28-
unsafe trait MyUnsafeTrait {}
21+
unsafe auto trait MyUnsafeTrait {}
2922

3023
#[allow(auto_impl)]
31-
impl MyUnsafeTrait for .. {}
24+
impl MyUnsafeTrait for Foo {}
3225
//~^ ERROR the trait `MyUnsafeTrait` requires an `unsafe impl` declaration
3326

3427
fn main() {}

src/test/compile-fail/issue-23080-2.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,11 @@
1212

1313
#![feature(optin_builtin_traits)]
1414

15-
unsafe trait Trait {
15+
unsafe auto trait Trait {
1616
//~^ ERROR E0380
1717
type Output;
1818
}
1919

20-
#[allow(auto_impl)]
21-
unsafe impl Trait for .. {}
22-
2320
fn call_method<T: Trait>(x: T) {}
2421

2522
fn main() {

src/test/compile-fail/issue-23080.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@
1212

1313
#![feature(optin_builtin_traits)]
1414

15-
unsafe trait Trait {
15+
unsafe auto trait Trait {
1616
//~^ ERROR E0380
1717
fn method(&self) {
1818
println!("Hello");
1919
}
2020
}
2121

22-
#[allow(auto_impl)]
23-
unsafe impl Trait for .. {}
24-
2522
fn call_method<T: Trait>(x: T) {
2623
x.method();
2724
}

src/test/compile-fail/phantom-oibit.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616

1717
use std::marker::{PhantomData};
1818

19-
unsafe trait Zen {}
20-
21-
#[allow(auto_impl)]
22-
unsafe impl Zen for .. {}
19+
unsafe auto trait Zen {}
2320

2421
unsafe impl<'a, T: 'a> Zen for &'a T where T: Sync {}
2522

src/test/compile-fail/privacy-sanity.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
trait MarkerTr {}
1413
pub trait Tr {
1514
fn f();
1615
const C: u8;
@@ -21,8 +20,6 @@ pub struct S {
2120
}
2221
struct Ts(pub u8);
2322

24-
#[allow(auto_impl)]
25-
pub impl MarkerTr for .. {} //~ ERROR unnecessary visibility qualifier
2623
pub impl Tr for S { //~ ERROR unnecessary visibility qualifier
2724
pub fn f() {} //~ ERROR unnecessary visibility qualifier
2825
pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier
@@ -39,7 +36,6 @@ pub extern "C" { //~ ERROR unnecessary visibility qualifier
3936
}
4037

4138
const MAIN: u8 = {
42-
trait MarkerTr {}
4339
pub trait Tr {
4440
fn f();
4541
const C: u8;
@@ -50,8 +46,6 @@ const MAIN: u8 = {
5046
}
5147
struct Ts(pub u8);
5248

53-
#[allow(auto_impl)]
54-
pub impl MarkerTr for .. {} //~ ERROR unnecessary visibility qualifier
5549
pub impl Tr for S { //~ ERROR unnecessary visibility qualifier
5650
pub fn f() {} //~ ERROR unnecessary visibility qualifier
5751
pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier
@@ -71,7 +65,6 @@ const MAIN: u8 = {
7165
};
7266

7367
fn main() {
74-
trait MarkerTr {}
7568
pub trait Tr {
7669
fn f();
7770
const C: u8;
@@ -82,8 +75,6 @@ fn main() {
8275
}
8376
struct Ts(pub u8);
8477

85-
#[allow(auto_impl)]
86-
pub impl MarkerTr for .. {} //~ ERROR unnecessary visibility qualifier
8778
pub impl Tr for S { //~ ERROR unnecessary visibility qualifier
8879
pub fn f() {} //~ ERROR unnecessary visibility qualifier
8980
pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier

src/test/compile-fail/specialization/defaultimpl/specialization-no-default-trait-implementations.rs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/test/compile-fail/specialization/specialization-polarity.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@
1313
#![feature(optin_builtin_traits)]
1414
#![feature(specialization)]
1515

16-
trait Foo {}
17-
18-
#[allow(auto_impl)]
19-
impl Foo for .. {}
16+
auto trait Foo {}
2017

2118
impl<T> Foo for T {}
2219
impl !Foo for u8 {} //~ ERROR E0119
2320

24-
trait Bar {}
25-
26-
#[allow(auto_impl)]
27-
impl Bar for .. {}
21+
auto trait Bar {}
2822

2923
impl<T> !Bar for T {}
3024
impl Bar for u8 {} //~ ERROR E0119

src/test/compile-fail/traits-inductive-overflow-supertrait-oibit.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414

1515
#![feature(optin_builtin_traits)]
1616

17-
trait Magic: Copy {} //~ ERROR E0568
18-
#[allow(auto_impl)]
19-
impl Magic for .. {}
17+
auto trait Magic: Copy {} //~ ERROR E0568
2018

2119
fn copy<T: Magic>(x: T) -> (T, T) { (x, x) }
2220

src/test/compile-fail/typeck-auto-trait-no-supertraits-2.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
trait Magic : Sized where Option<Self> : Magic {} //~ ERROR E0568
14-
#[allow(auto_impl)]
15-
impl Magic for .. {}
13+
auto trait Magic : Sized where Option<Self> : Magic {} //~ ERROR E0568
1614
impl<T:Magic> Magic for T {}
1715

1816
fn copy<T: Magic>(x: T) -> (T, T) { (x, x) }

src/test/compile-fail/typeck-auto-trait-no-supertraits.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434

3535
#![feature(optin_builtin_traits)]
3636

37-
trait Magic: Copy {} //~ ERROR E0568
38-
#[allow(auto_impl)]
39-
impl Magic for .. {}
37+
auto trait Magic: Copy {} //~ ERROR E0568
4038
impl<T:Magic> Magic for T {}
4139

4240
fn copy<T: Magic>(x: T) -> (T, T) { (x, x) }

src/test/compile-fail/typeck-auto-trait-no-typeparams.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/test/compile-fail/typeck-default-trait-impl-constituent-types-2.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
trait MyTrait {}
14-
15-
#[allow(auto_impl)]
16-
impl MyTrait for .. {}
13+
auto trait MyTrait {}
1714

1815
struct MyS;
1916

src/test/compile-fail/typeck-default-trait-impl-constituent-types.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
trait MyTrait {}
13+
auto trait MyTrait {}
1414

15-
#[allow(auto_impl)]
16-
impl MyTrait for .. {}
1715
impl<T> !MyTrait for *mut T {}
1816

1917
struct MyS;

src/test/compile-fail/typeck-default-trait-impl-negation.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,9 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
trait MyTrait {}
13+
auto trait MyTrait {}
1414

15-
#[allow(auto_impl)]
16-
impl MyTrait for .. {}
17-
18-
unsafe trait MyUnsafeTrait {}
19-
20-
#[allow(auto_impl)]
21-
unsafe impl MyUnsafeTrait for .. {}
15+
unsafe auto trait MyUnsafeTrait {}
2216

2317
struct ThisImplsTrait;
2418

src/test/compile-fail/typeck-default-trait-impl-precedence.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@
1010

1111
// Test that declaring that `&T` is `Defaulted` if `T:Signed` implies
1212
// that other `&T` is NOT `Defaulted` if `T:Signed` does not hold. In
13-
// other words, the `..` impl only applies if there are no existing
13+
// other words, the auto impl only applies if there are no existing
1414
// impls whose types unify.
1515

1616
#![feature(optin_builtin_traits)]
1717

18-
trait Defaulted { }
19-
#[allow(auto_impl)]
20-
impl Defaulted for .. { }
18+
auto trait Defaulted { }
2119
impl<'a,T:Signed> Defaulted for &'a T { }
2220
impl<'a,T:Signed> Defaulted for &'a mut T { }
2321
fn is_defaulted<T:Defaulted>() { }

src/test/run-make/simd-ffi/simd.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,4 @@ pub mod marker {
8080
}
8181

8282
#[lang = "freeze"]
83-
trait Freeze {}
84-
#[allow(auto_impl)]
85-
impl Freeze for .. {}
83+
auto trait Freeze {}

src/test/run-make/target-specs/foo.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ trait Copy { }
1818
trait Sized { }
1919

2020
#[lang = "freeze"]
21-
trait Freeze {}
22-
#[allow(auto_impl)]
23-
impl Freeze for .. {}
21+
auto trait Freeze {}
2422

2523
#[lang="start"]
2624
fn start(_main: *const u8, _argc: isize, _argv: *const *const u8) -> isize { 0 }

src/test/run-pass/auto-traits.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
#![feature(optin_builtin_traits)]
1212

1313
auto trait Auto {}
14-
// Redundant but accepted until we remove it.
15-
#[allow(auto_impl)]
16-
impl Auto for .. {}
1714

1815
unsafe auto trait AutoUnsafe {}
1916

src/test/run-pass/issue-29516.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
trait NotSame {}
14-
#[allow(auto_impl)]
15-
impl NotSame for .. {}
13+
auto trait NotSame {}
14+
1615
impl<A> !NotSame for (A, A) {}
1716

1817
trait OneOfEach {}

src/test/rustdoc/auxiliary/rustdoc-default-impl.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
pub mod bar {
1515
use std::marker;
1616

17-
pub trait Bar {}
18-
19-
#[allow(auto_impl)]
20-
impl Bar for .. {}
17+
pub auto trait Bar {}
2118

2219
pub trait Foo {
2320
fn foo(&self) {}

src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,4 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
pub trait AnOibit {}
14-
15-
#[allow(auto_impl)]
16-
impl AnOibit for .. {}
13+
pub auto trait AnOibit {}

src/test/rustdoc/impl-parts.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010

1111
#![feature(optin_builtin_traits)]
1212

13-
pub trait AnOibit {}
14-
15-
#[allow(auto_impl)]
16-
impl AnOibit for .. {}
13+
pub auto trait AnOibit {}
1714

1815
pub struct Foo<T> { field: T }
1916

0 commit comments

Comments
 (0)