Skip to content

Add missing 2015 edition directives #141886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/ui/did_you_mean/E0178.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//@ edition:2015
#![allow(bare_trait_objects)]

trait Foo {}
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/did_you_mean/E0178.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0178]: expected a path on the left-hand side of `+`
--> $DIR/E0178.rs:6:8
--> $DIR/E0178.rs:7:8
|
LL | w: &'a Foo + Copy,
| ^^^^^^^
Expand All @@ -10,7 +10,7 @@ LL | w: &'a (Foo + Copy),
| + +

error[E0178]: expected a path on the left-hand side of `+`
--> $DIR/E0178.rs:7:8
--> $DIR/E0178.rs:8:8
|
LL | x: &'a Foo + 'a,
| ^^^^^^^
Expand All @@ -21,7 +21,7 @@ LL | x: &'a (Foo + 'a),
| + +

error[E0178]: expected a path on the left-hand side of `+`
--> $DIR/E0178.rs:8:8
--> $DIR/E0178.rs:9:8
|
LL | y: &'a mut Foo + 'a,
| ^^^^^^^^^^^
Expand All @@ -32,7 +32,7 @@ LL | y: &'a mut (Foo + 'a),
| + +

error[E0178]: expected a path on the left-hand side of `+`
--> $DIR/E0178.rs:9:8
--> $DIR/E0178.rs:10:8
|
LL | z: fn() -> Foo + 'a,
| ^^^^^^^^^^^-----
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//@ edition: 2015
#![allow(bare_trait_objects)]

fn main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0178]: expected a path on the left-hand side of `+`
--> $DIR/trait-object-reference-without-parens-suggestion.rs:4:12
--> $DIR/trait-object-reference-without-parens-suggestion.rs:5:12
|
LL | let _: &Copy + 'static;
| ^^^^^
Expand All @@ -10,7 +10,7 @@ LL | let _: &(Copy + 'static);
| + +

error[E0178]: expected a path on the left-hand side of `+`
--> $DIR/trait-object-reference-without-parens-suggestion.rs:6:12
--> $DIR/trait-object-reference-without-parens-suggestion.rs:7:12
|
LL | let _: &'static Copy + 'static;
| ^^^^^^^^^^^^^
Expand All @@ -21,7 +21,7 @@ LL | let _: &'static (Copy + 'static);
| + +

error[E0038]: the trait `Copy` is not dyn compatible
--> $DIR/trait-object-reference-without-parens-suggestion.rs:4:13
--> $DIR/trait-object-reference-without-parens-suggestion.rs:5:13
|
LL | let _: &Copy + 'static;
| ^^^^ `Copy` is not dyn compatible
Expand All @@ -31,7 +31,7 @@ LL | let _: &Copy + 'static;
for more information, visit <https://doc.rust-lang.org/reference/items/traits.html#dyn-compatibility>

error[E0038]: the trait `Copy` is not dyn compatible
--> $DIR/trait-object-reference-without-parens-suggestion.rs:6:21
--> $DIR/trait-object-reference-without-parens-suggestion.rs:7:21
|
LL | let _: &'static Copy + 'static;
| ^^^^ `Copy` is not dyn compatible
Expand Down
1 change: 1 addition & 0 deletions tests/ui/editions/async-block-2015.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//@ edition:2015
async fn foo() {
//~^ ERROR `async fn` is not permitted in Rust 2015
//~| NOTE to use `async fn`, switch to Rust 2018 or later
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/editions/async-block-2015.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0670]: `async fn` is not permitted in Rust 2015
--> $DIR/async-block-2015.rs:1:1
--> $DIR/async-block-2015.rs:2:1
|
LL | async fn foo() {
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
Expand All @@ -8,7 +8,7 @@ LL | async fn foo() {
= note: for more on editions, read https://doc.rust-lang.org/edition-guide

error: expected identifier, found keyword `let`
--> $DIR/async-block-2015.rs:11:9
--> $DIR/async-block-2015.rs:12:9
|
LL | let y = async {
| ----- `async` blocks are only allowed in Rust 2018 or later
Expand All @@ -19,7 +19,7 @@ LL | let x = 42;
= note: for more on editions, read https://doc.rust-lang.org/edition-guide

error: expected identifier, found `42`
--> $DIR/async-block-2015.rs:19:9
--> $DIR/async-block-2015.rs:20:9
|
LL | let z = async {
| ----- `async` blocks are only allowed in Rust 2018 or later
Expand All @@ -30,7 +30,7 @@ LL | 42
= note: for more on editions, read https://doc.rust-lang.org/edition-guide

error[E0422]: cannot find struct, variant or union type `async` in this scope
--> $DIR/async-block-2015.rs:7:13
--> $DIR/async-block-2015.rs:8:13
|
LL | let x = async {};
| ^^^^^ `async` blocks are only allowed in Rust 2018 or later
Expand Down
1 change: 1 addition & 0 deletions tests/ui/ergonomic-clones/async/edition-2015.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//@ edition:2015
#![feature(ergonomic_clones)]
#![allow(incomplete_features)]

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/ergonomic-clones/async/edition-2015.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `async use` blocks are only allowed in Rust 2018 or later
--> $DIR/edition-2015.rs:5:5
--> $DIR/edition-2015.rs:6:5
|
LL | async use {};
| ^^^^^^^^^
Expand Down
1 change: 1 addition & 0 deletions tests/ui/errors/dynless-turbofish-e0191-issue-91997.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//@ edition:2015
trait MyIterator : Iterator {}

fn main() {
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/errors/dynless-turbofish-e0191-issue-91997.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
warning: trait objects without an explicit `dyn` are deprecated
--> $DIR/dynless-turbofish-e0191-issue-91997.rs:4:13
--> $DIR/dynless-turbofish-e0191-issue-91997.rs:5:13
|
LL | let _ = MyIterator::next;
| ^^^^^^^^^^
Expand All @@ -13,7 +13,7 @@ LL | let _ = <dyn MyIterator>::next;
| ++++ +

error[E0191]: the value of the associated type `Item` in `Iterator` must be specified
--> $DIR/dynless-turbofish-e0191-issue-91997.rs:4:13
--> $DIR/dynless-turbofish-e0191-issue-91997.rs:5:13
|
LL | let _ = MyIterator::next;
| ^^^^^^^^^^ help: specify the associated type: `MyIterator::<Item = Type>`
Expand Down
1 change: 1 addition & 0 deletions tests/ui/expr/scope.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//@ edition:2015
//@ run-pass
// Regression test for issue #762

Expand Down
1 change: 1 addition & 0 deletions tests/ui/imports/import-glob-crate.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//@ edition: 2015
//@ run-pass
use std::mem::*;

Expand Down
Loading