tests/ui: use revisions for editions in several tests #155498
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| //@ revisions: rust2015 rust2021 | ||
| //@[rust2015] edition:2015 | ||
| //@[rust2021] edition:2021 | ||
|
|
||
|
|
||
| trait Foo { | ||
| type Clone; | ||
| fn foo() -> Clone; | ||
| //[rust2021]~^ ERROR expected a type, found a trait | ||
| //[rust2021]~| HELP `Clone` is dyn-incompatible, use `impl Clone` to return an opaque type, as long as you return a single underlying type | ||
| //[rust2015]~^^^ WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects] | ||
| //[rust2015]~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021! | ||
| //[rust2015]~| HELP if this is a dyn-compatible trait, use `dyn` | ||
| //[rust2015]~| WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects] | ||
| //[rust2015]~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021! | ||
| //[rust2015]~| HELP if this is a dyn-compatible trait, use `dyn` | ||
| //[rust2015]~| ERROR the trait `Clone` is not dyn compatible [E0038] | ||
| //~| HELP there is an associated type with the same name | ||
| //[rust2015]~| HELP use `Self` to refer to the implementing type | ||
|
Comment on lines
+9
to
+19
Member
There was a problem hiding this comment. Given the greatly decreased readability of these error annotations, I'm inclined to think that merging these particular tests is not worthwhile. |
||
| } | ||
|
|
||
| trait DbHandle: Sized {} | ||
|
|
||
| trait DbInterface { | ||
| type DbHandle; | ||
| fn handle() -> DbHandle; | ||
| //[rust2021]~^ ERROR expected a type, found a trait | ||
| //[rust2021]~| HELP `DbHandle` is dyn-incompatible, use `impl DbHandle` to return an opaque type, as long as you return a single underlying type | ||
| //[rust2015]~^^^ WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects] | ||
| //[rust2015]~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021! | ||
| //[rust2015]~| HELP if this is a dyn-compatible trait, use `dyn` | ||
| //[rust2015]~| WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects] | ||
| //[rust2015]~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021! | ||
| //[rust2015]~| HELP if this is a dyn-compatible trait, use `dyn` | ||
| //[rust2015]~| ERROR the trait `DbHandle` is not dyn compatible [E0038] | ||
| //~| HELP there is an associated type with the same name | ||
| //[rust2015]~| HELP use `Self` to refer to the implementing type | ||
| } | ||
|
|
||
| fn main() {} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Renaming this test to
bare_trait_objects.rshas ended up losing all the context of #116434 and #120530.It turns out that this test is specifically trying to test how traits that aren't dyn-compatible influence the diagnostic messages.
View changes since the review