Generic Associated Types in Trait Paths - Ast part by b-naber · Pull Request #79266 · rust-lang/rust

b-naber · 2020-11-21T14:54:54Z

The Ast part of #78978

rust-highfive · 2020-11-21T14:54:57Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

compiler/rustc_ast/src/ast.rs

compiler/rustc_ast_passes/src/ast_validation.rs

compiler/rustc_parse/src/parser/path.rs

petrochenkov · 2020-11-21T15:45:29Z

Looks great, I left some comments, mostly about error wording and formatting.

b-naber · 2020-11-23T17:04:46Z

Implemented the suggestions and addressed one of your comments on raising an error when gen_argis None.

b-naber · 2020-11-23T18:00:47Z

Failing the CI tests because of formatting issues. I did call ./x.py fmt. Is there some way to automatically format the tests? How do I split a long error or warning annotation in a test file into multiple lines?

src/test/ui/generic-associated-types/parse/issue-67510.rs

src/test/ui/generic-associated-types/parse/issue-67510-9.rs

src/test/ui/generic-associated-types/parse/issue-67510-8.rs

src/test/ui/generic-associated-types/parse/issue-67510-6.stderr

compiler/rustc_parse/src/parser/path.rs

src/test/ui/generic-associated-types/parse/trait-path-expressions.rs

petrochenkov · 2020-11-24T20:51:23Z

r=me after waiting for green CI and squashing commits.

cynecx · 2020-11-24T21:23:49Z

src/test/ui/issues/issue-34334.stderr

this diagnostic is somewhat unfortunate?

Agree. Improving diagnostics will be done in a separate PR.

petrochenkov · 2020-11-25T18:35:43Z

Not sure what is the status here.
Some commits were squashed, but other commits changing the same code back and forth still remain.

@b-naber, could you address #79266 (comment) and squash the remaining commits?

…ents in AssocTyConstraints haven't been fully implemented

b-naber · 2020-11-25T19:09:25Z

Should be fixed now.

b-naber · 2020-11-25T20:27:04Z

Also addressed your comment, not sure why it's not shown as outdated yet.

petrochenkov · 2020-11-25T22:09:30Z

Thanks!
@bors r+

bors · 2020-11-25T22:09:32Z

📌 Commit 5c4568d has been approved by petrochenkov

bors · 2020-11-25T23:49:47Z

⌛ Testing commit 5c4568d with merge 585713a038fc284d0a7d79e2daac755d17446b89...

bors · 2020-11-25T23:55:51Z

💔 Test failed - checks-actions

jonas-schievink · 2020-11-26T02:05:25Z

@bors retry

b-naber · 2020-11-26T08:08:46Z

Sorry, accidentally closed this on my cell phone.

petrochenkov · 2020-11-26T10:28:17Z

@bors retry

bors · 2020-11-27T00:18:31Z

⌛ Testing commit 5c4568d with merge cfed918...

bors · 2020-11-27T02:26:32Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing cfed918 to master...

…r=petrochenkov Improve diagnostics when parsing angle args rust-lang#79266 introduced parsing of generic arguments in associated type constraints, this however resulted in possibly very confusing error messages in cases in which closing angle brackets were missing such as in `Vec<(u32, _, _) = vec![]`, which outputs an incorrectly parsed equality constraint error, as noted by `@cynecx.` This PR tries to provide better error messages in such cases. r? `@petrochenkov`

rust-highfive assigned petrochenkov Nov 21, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 21, 2020

petrochenkov reviewed Nov 21, 2020

View reviewed changes

petrochenkov 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 Nov 21, 2020

petrochenkov reviewed Nov 23, 2020

View reviewed changes

petrochenkov reviewed Nov 24, 2020

View reviewed changes

src/test/ui/generic-associated-types/parse/trait-path-expressions.rs Outdated Show resolved Hide resolved

cynecx reviewed Nov 24, 2020

View reviewed changes

b-naber force-pushed the gat_trait_path_parser branch from 41d899d to 1206495 Compare November 25, 2020 08:10

b-naber added 2 commits November 25, 2020 19:55

ast and parser

823dbb3

insert span_fatal call in ast lowering to indicate that generic argum…

37d103f

…ents in AssocTyConstraints haven't been fully implemented

b-naber force-pushed the gat_trait_path_parser branch from 1206495 to 2d18e88 Compare November 25, 2020 19:05

add tests

5c4568d

b-naber force-pushed the gat_trait_path_parser branch from 2d18e88 to 5c4568d Compare November 25, 2020 19:09

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 Nov 25, 2020

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 25, 2020

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 25, 2020

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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 26, 2020

b-naber closed this Nov 26, 2020

b-naber reopened this Nov 26, 2020

camelid added A-trait-system Area: Trait system F-generic_associated_types `#![feature(generic_associated_types)]` a.k.a. GATs A-parser Area: The lexing & parsing of Rust source code to an AST labels Nov 27, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 27, 2020

bors merged commit cfed918 into rust-lang:master Nov 27, 2020

rustbot added this to the 1.50.0 milestone Nov 27, 2020

bors mentioned this pull request Nov 27, 2020

WIP Generic associated types in trait paths #78978

Closed

b-naber deleted the gat_trait_path_parser branch November 27, 2020 13:12

b-naber mentioned this pull request Dec 15, 2020

Improve diagnostics when parsing angle args #80065

Merged

Uh oh!

Conversation

b-naber commented Nov 21, 2020

Uh oh!

rust-highfive commented Nov 21, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Nov 21, 2020

Uh oh!

b-naber commented Nov 23, 2020

Uh oh!

b-naber commented Nov 23, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Nov 24, 2020

Uh oh!

cynecx Nov 24, 2020

Choose a reason for hiding this comment

Uh oh!

b-naber Nov 25, 2020

Choose a reason for hiding this comment

Uh oh!

petrochenkov commented Nov 25, 2020

Uh oh!

b-naber commented Nov 25, 2020

Uh oh!

b-naber commented Nov 25, 2020

Uh oh!

petrochenkov commented Nov 25, 2020

Uh oh!

bors commented Nov 25, 2020

Uh oh!

bors commented Nov 25, 2020

Uh oh!

bors commented Nov 25, 2020

Uh oh!

jonas-schievink commented Nov 26, 2020

Uh oh!

b-naber commented Nov 26, 2020

Uh oh!

petrochenkov commented Nov 26, 2020

Uh oh!

bors commented Nov 27, 2020

Uh oh!

bors commented Nov 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants