Skip to content

Commit 0d96a79

Browse files
committed
Organize trait test files
1 parent 921ec4b commit 0d96a79

File tree

288 files changed

+285
-285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+285
-285
lines changed

src/test/ui/traits/trait-alias-ambiguous.stderr renamed to src/test/ui/traits/alias/ambiguous.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0034]: multiple applicable items in scope
2-
--> $DIR/trait-alias-ambiguous.rs:21:7
2+
--> $DIR/ambiguous.rs:21:7
33
|
44
LL | t.foo();
55
| ^^^ multiple `foo` found
66
|
77
note: candidate #1 is defined in an impl of the trait `A` for the type `u8`
8-
--> $DIR/trait-alias-ambiguous.rs:8:9
8+
--> $DIR/ambiguous.rs:8:9
99
|
1010
LL | fn foo(&self) {}
1111
| ^^^^^^^^^^^^^
1212
note: candidate #2 is defined in an impl of the trait `B` for the type `u8`
13-
--> $DIR/trait-alias-ambiguous.rs:11:9
13+
--> $DIR/ambiguous.rs:11:9
1414
|
1515
LL | fn foo(&self) {}
1616
| ^^^^^^^^^^^^^

src/test/ui/traits/trait-alias/trait-alias-cross-crate.rs renamed to src/test/ui/traits/alias/cross-crate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// aux-build:trait_alias.rs
1+
// aux-build:send_sync.rs
22

33
#![feature(trait_alias)]
44

5-
extern crate trait_alias;
5+
extern crate send_sync;
66

77
use std::rc::Rc;
8-
use trait_alias::SendSync;
8+
use send_sync::SendSync;
99

1010
fn use_alias<T: SendSync>() {}
1111

src/test/ui/traits/trait-alias/trait-alias-cross-crate.stderr renamed to src/test/ui/traits/alias/cross-crate.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `Rc<u32>` cannot be sent between threads safely
2-
--> $DIR/trait-alias-cross-crate.rs:14:17
2+
--> $DIR/cross-crate.rs:14:17
33
|
44
LL | fn use_alias<T: SendSync>() {}
55
| -------- required by this bound in `use_alias`
@@ -10,7 +10,7 @@ LL | use_alias::<Rc<u32>>();
1010
= help: the trait `Send` is not implemented for `Rc<u32>`
1111

1212
error[E0277]: `Rc<u32>` cannot be shared between threads safely
13-
--> $DIR/trait-alias-cross-crate.rs:14:17
13+
--> $DIR/cross-crate.rs:14:17
1414
|
1515
LL | fn use_alias<T: SendSync>() {}
1616
| -------- required by this bound in `use_alias`

src/test/ui/traits/trait-alias/trait-alias-impl.stderr renamed to src/test/ui/traits/alias/impl.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0404]: expected trait, found trait alias `DefaultAlias`
2-
--> $DIR/trait-alias-impl.rs:5:6
2+
--> $DIR/impl.rs:5:6
33
|
44
LL | impl DefaultAlias for () {}
55
| ^^^^^^^^^^^^ not a trait

0 commit comments

Comments
 (0)