Skip to content

Commit b2ab7cf

Browse files
committed
Gate 2015 UI tests
1 parent cf8a955 commit b2ab7cf

File tree

445 files changed

+1790
-1314
lines changed

Some content is hidden

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

445 files changed

+1790
-1314
lines changed

tests/ui/annotate-snippet/missing-type.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ edition: 2015
12
//@ compile-flags: --error-format human-annotate-rs -Z unstable-options
23

34
pub fn main() {

tests/ui/annotate-snippet/missing-type.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0412]: cannot find type `Iter` in this scope
2-
--> $DIR/missing-type.rs:4:12
2+
--> $DIR/missing-type.rs:5:12
33
|
44
LL | let x: Iter;
55
| ^^^^ not found in this scope

tests/ui/asm/naked-invalid-attr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ edition:2015
12
// Checks that the #[unsafe(naked)] attribute can be placed on function definitions only.
23
//
34
//@ needs-asm-support

tests/ui/asm/naked-invalid-attr.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
error[E0433]: failed to resolve: use of unresolved module or unlinked crate `a`
2-
--> $DIR/naked-invalid-attr.rs:56:5
2+
--> $DIR/naked-invalid-attr.rs:57:5
33
|
44
LL | #[::a]
55
| ^ use of unresolved module or unlinked crate `a`
66

77
error: `#[naked]` attribute cannot be used on crates
8-
--> $DIR/naked-invalid-attr.rs:4:1
8+
--> $DIR/naked-invalid-attr.rs:5:1
99
|
1010
LL | #![unsafe(naked)]
1111
| ^^^^^^^^^^^^^^^^^
1212
|
1313
= help: `#[naked]` can only be applied to functions
1414

1515
error: `#[naked]` attribute cannot be used on foreign functions
16-
--> $DIR/naked-invalid-attr.rs:9:5
16+
--> $DIR/naked-invalid-attr.rs:10:5
1717
|
1818
LL | #[unsafe(naked)]
1919
| ^^^^^^^^^^^^^^^^
2020
|
2121
= help: `#[naked]` can be applied to functions and methods
2222

2323
error: `#[naked]` attribute cannot be used on structs
24-
--> $DIR/naked-invalid-attr.rs:13:1
24+
--> $DIR/naked-invalid-attr.rs:14:1
2525
|
2626
LL | #[unsafe(naked)]
2727
| ^^^^^^^^^^^^^^^^
2828
|
2929
= help: `#[naked]` can only be applied to functions
3030

3131
error: `#[naked]` attribute cannot be used on struct fields
32-
--> $DIR/naked-invalid-attr.rs:16:5
32+
--> $DIR/naked-invalid-attr.rs:17:5
3333
|
3434
LL | #[unsafe(naked)]
3535
| ^^^^^^^^^^^^^^^^
3636
|
3737
= help: `#[naked]` can only be applied to functions
3838

3939
error: `#[naked]` attribute cannot be used on required trait methods
40-
--> $DIR/naked-invalid-attr.rs:22:5
40+
--> $DIR/naked-invalid-attr.rs:23:5
4141
|
4242
LL | #[unsafe(naked)]
4343
| ^^^^^^^^^^^^^^^^
4444
|
4545
= help: `#[naked]` can be applied to functions, inherent methods, provided trait methods, and trait methods in impl blocks
4646

4747
error: `#[naked]` attribute cannot be used on closures
48-
--> $DIR/naked-invalid-attr.rs:51:5
48+
--> $DIR/naked-invalid-attr.rs:52:5
4949
|
5050
LL | #[unsafe(naked)]
5151
| ^^^^^^^^^^^^^^^^
5252
|
5353
= help: `#[naked]` can be applied to functions and methods
5454

5555
error[E0736]: attribute incompatible with `#[unsafe(naked)]`
56-
--> $DIR/naked-invalid-attr.rs:56:3
56+
--> $DIR/naked-invalid-attr.rs:57:3
5757
|
5858
LL | #[::a]
5959
| ^^^ the `::a` attribute is incompatible with `#[unsafe(naked)]`

tests/ui/associated-types/associated-types-impl-redirect.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ edition:2015
12
//@ run-pass
23
#![allow(dead_code)]
34
#![allow(unused_mut)]

tests/ui/associated-types/associated-types-issue-20346.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ edition:2015
12
// Test that we reliably check the value of the associated type.
23

34
#![crate_type = "lib"]

tests/ui/associated-types/associated-types-issue-20346.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0271]: type mismatch resolving `<Adapter<I> as Iterator>::Item == Option<T>`
2-
--> $DIR/associated-types-issue-20346.rs:34:36
2+
--> $DIR/associated-types-issue-20346.rs:35:36
33
|
44
LL | fn test_adapter<T, I: Iterator<Item=Option<T>>>(it: I) {
55
| - found this type parameter
@@ -10,14 +10,14 @@ LL | is_iterator_of::<Option<T>, _>(&adapter);
1010
| required by a bound introduced by this call
1111
|
1212
note: expected this to be `Option<T>`
13-
--> $DIR/associated-types-issue-20346.rs:23:17
13+
--> $DIR/associated-types-issue-20346.rs:24:17
1414
|
1515
LL | type Item = T;
1616
| ^
1717
= note: expected enum `Option<T>`
1818
found type parameter `T`
1919
note: required by a bound in `is_iterator_of`
20-
--> $DIR/associated-types-issue-20346.rs:15:34
20+
--> $DIR/associated-types-issue-20346.rs:16:34
2121
|
2222
LL | fn is_iterator_of<A, I: Iterator<Item=A>>(_: &I) {}
2323
| ^^^^^^ required by this bound in `is_iterator_of`

tests/ui/associated-types/associated-types-where-clause-impl-ambiguity.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ edition:2015
12
//@ run-pass
23
#![allow(dead_code)]
34
#![allow(unused_imports)]

tests/ui/associated-types/cache/chrono-scan.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ edition:2015
12
//@ check-pass
23

34
#![allow(deprecated)]

tests/ui/associated-types/projection-dyn-associated-type.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Regression test for the projection bug in <https://github.com/rust-lang/rust/issues/123953>
22
//
3+
//@ edition: 2015
34
//@ compile-flags: -Zincremental-verify-ich=yes
45
//@ incremental
56

0 commit comments

Comments
 (0)