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.

Sign up for GitHub

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

Jump to bottom

Use revisions instead of nll compare mode for /regions/ ui tests #96212

Merged
merged 1 commit into from
Apr 25, 2022
Merged

Use revisions instead of nll compare mode for /regions/ ui tests #96212

merged 1 commit into from
Apr 25, 2022

Conversation

marmeladema
Copy link
Contributor

@marmeladema marmeladema commented Apr 19, 2022 •
edited
Loading

Created #96211 for the duplicated mismatched types errors

r? @jackh726

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 19, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2022
jackh726
jackh726 requested changes Apr 19, 2022
View reviewed changes
Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

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

Still have some more tests to get through.

A number of diagnostic regressions, some of these can probably be combined into a single issue.

Also, when you add in a new line with //[nll]~, but the previous line has the error annotation at the end of the line, can you instead move both to be on separate lines?

src/test/ui/regions/issue-28848.rs Outdated Show resolved Hide resolved
src/test/ui/regions/region-invariant-static-error-reporting.base.stderr Show resolved Hide resolved
src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.polonius.stderr Show resolved Hide resolved
src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs Show resolved Hide resolved
src/test/ui/regions/regions-addr-of-upvar-self.rs Show resolved Hide resolved
src/test/ui/regions/regions-close-object-into-object-2.nll.stderr Show resolved Hide resolved
src/test/ui/regions/regions-close-object-into-object-4.rs Outdated Show resolved Hide resolved
src/test/ui/regions/regions-close-object-into-object-5.base.stderr Show resolved Hide resolved
src/test/ui/regions/regions-close-over-type-parameter-multiple.rs Outdated Show resolved Hide resolved
src/test/ui/regions/regions-close-param-into-object.base.stderr Show resolved Hide resolved
@marmeladema marmeladema force-pushed the nll-revisions-regions branch from e445e68 to 816f0f2 Compare April 19, 2022 21:54
@marmeladema
Copy link
Contributor Author

Also, when you add in a new line with //[nll]~, but the previous line has the error annotation at the end of the line, can you instead move both to be on separate lines?

Done!
And also took care of the 2 new files shenanigan.
Will create issues tomorrow.

@jackh726
Copy link
Member

Can you rebase on master to get #96236

@jackh726
Copy link
Member

(not sure it changes anything)

@marmeladema marmeladema force-pushed the nll-revisions-regions branch from 816f0f2 to 12510d2 Compare April 21, 2022 13:34
@marmeladema
Copy link
Contributor Author

Can you rebase on master to get #96236

Just did but unfortunately it doesn't change anything

@jackh726
Copy link
Member

Just finished reviewing and looks fine. Just need to address the previous reviews.

@jackh726 jackh726 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2022
This was referenced Apr 23, 2022
Open
Open
@marmeladema
Copy link
Contributor Author

@jackh726 I created a bunch of issues, I think we're good to go.

@jackh726 jackh726 mentioned this pull request Apr 24, 2022
Merged
@marmeladema marmeladema force-pushed the nll-revisions-regions branch from 12510d2 to e10aa15 Compare April 24, 2022 19:57
@jackh726
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 24, 2022

📌 Commit e10aa15 has been approved by jackh726

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 24, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 24, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2022
@bors
Auto merge of rust-lang#96369 - matthiaskrgr:rollup-q18w4v2, r=matthi…
1f631e8 
…askrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#95395 (Better error message for `_` in function signature in `impl Trait for Ty`)
 - rust-lang#96090 (Implement MIR opt unit tests)
 - rust-lang#96107 ([test] Add test cases for untested functions for VecDeque)
 - rust-lang#96212 (Use revisions instead of nll compare mode for `/regions/` ui tests)
 - rust-lang#96215 (Drop support for legacy PM with LLVM 15)
 - rust-lang#96366 (bootstrap: Remove dead code in rustdoc shim)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 50294f6 into rust-lang:master Apr 25, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 25, 2022
@marmeladema marmeladema deleted the nll-revisions-regions branch April 25, 2022 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackh726 jackh726 jackh726 requested changes

Assignees

@jackh726 jackh726

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.62.0
Development

Successfully merging this pull request may close these issues.
5 participants
@marmeladema @jackh726 @bors @rust-highfive @rustbot