Skip to content
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

update most tests to 2021 edition #7866

Merged
merged 1 commit into from
Nov 1, 2021
Merged

update most tests to 2021 edition #7866

merged 1 commit into from
Nov 1, 2021

Conversation

llogiq
Copy link
Contributor

@llogiq llogiq commented Oct 23, 2021

Some tests would no longer work at all, so I added edition:2015 or edition:2018 to them.

Notably 2021 panics are not yet detected correctly. Once ready, this closes #7842.


changelog: none

@rust-highfive
Copy link

r? @Manishearth

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Oct 23, 2021
@llogiq
Copy link
Contributor Author

llogiq commented Oct 23, 2021

@Manishearth do you want to release a compiletest-rs version so we don't have to use the master (or the current commit)?

@Manishearth
Copy link
Member

@llogiq can you make a PR bumping the revision?

@llogiq
Copy link
Contributor Author

llogiq commented Oct 24, 2021

Done.

@Manishearth
Copy link
Member

(and published)

Cargo.toml Show resolved Hide resolved
@Manishearth
Copy link
Member

Can you add comments for why certain tests are pinned to 2015?

@bors
Copy link
Contributor

bors commented Oct 28, 2021

☔ The latest upstream changes (presumably #7810) made this pull request unmergeable. Please resolve the merge conflicts.

@llogiq
Copy link
Contributor Author

llogiq commented Oct 29, 2021

I haven't finished all of the tests. Will hopefully finish them shortly.

@llogiq llogiq force-pushed the edition-2021-tests branch 2 times, most recently from 8ae099f to 23fc9a7 Compare October 30, 2021 12:01
@llogiq
Copy link
Contributor Author

llogiq commented Oct 30, 2021

@Manishearth r?

@@ -1,10 +1,12 @@
//edition:2015
//FIXME: The lint only triggers once on edition 2021, so I'm leaving this at 2015 for now.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please file an issue

// the 2015 edition here is needed because edition 2018 changed the module system
// (see https://doc.rust-lang.org/edition-guide/rust-2018/path-changes.html) which means the lint
// no longer detects some of the cases starting with Rust 2018.
// FIXME: We should likely add another edition 2021 test case for this lint
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

file an issue

// run-rustfix
// aux-build:wildcard_imports_helper.rs

// the 2015 edition here is needed because edition 2018 changed the module system
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also here

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 1, 2021

📌 Commit a4ede72 has been approved by Manishearth

@Manishearth
Copy link
Member

Please file issues for the fixmes

@bors
Copy link
Contributor

bors commented Nov 1, 2021

⌛ Testing commit a4ede72 with merge 7cd9bf5...

@bors
Copy link
Contributor

bors commented Nov 1, 2021

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Manishearth
Pushing 7cd9bf5 to master...

@bors bors merged commit 7cd9bf5 into master Nov 1, 2021
@flip1995 flip1995 deleted the edition-2021-tests branch November 4, 2021 11:31
@llogiq
Copy link
Contributor Author

llogiq commented Nov 8, 2021

I filed issues for the files still on the 2015 edition.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade UI tests to 2021
5 participants