syntax: cleanup param, method, and misc parsing #64910

Centril · 2019-09-30T02:39:35Z

Do some misc cleanup of the parser:

Method and parameter parsing is refactored.
A parser for const | mut is introduced that Add a raw "address of" operator #64588 can reuse.
Some other misc parsing.

Next up in a different PR:

~~Implementing Diagnostics: help text for missing left-hand side in arbitrary self type #64252.~~ -- maybe some other time...
Heavily restructuring up item.rs which is a mess (hopefully, no promises ^^).

petrochenkov · 2019-09-30T13:05:01Z

@Centril
Please, merge parse_self_param back into a single function.
Fragmenting implementation like this is harmful for readability.
I may be biased because I wrote it, but from my point of view it's written exactly like it should be (except for moving ifs on arms perhaps).

petrochenkov · 2019-09-30T13:08:04Z

I think the end goal here is unified syntax and AST representation for free, trait, impl and foreign items (#48137) with inappropriate qualifiers or selfs, missing bodies, etc reported as semantic errors.

petrochenkov · 2019-09-30T13:30:29Z

merge ... back into a single function

Same applies to parse_visibility, except perhaps for the diagnostics/recovery-only part.

src/libsyntax/parse/parser.rs

src/libsyntax/parse/parser/item.rs

petrochenkov · 2019-09-30T13:39:38Z

Otherwise, LGTM.

bors · 2019-10-01T07:55:02Z

📌 Commit 5c5dd80 has been approved by petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@ghost

Rollup of 5 pull requests Successful merges: - #63416 (apfloat: improve doc comments) - #64404 (Add long error explanation for E0495) - #64910 (syntax: cleanup param, method, and misc parsing) - #64912 (Remove unneeded `fn main` blocks from docs) - #64952 (Update cargo.) Failed merges: r? @ghost

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@ghost

Rollup of 7 pull requests Successful merges: - #63416 (apfloat: improve doc comments) - #64820 (BTreeSet intersection, is_subset & difference optimizations) - #64910 (syntax: cleanup param, method, and misc parsing) - #64912 (Remove unneeded `fn main` blocks from docs) - #64933 (Fixes #64919. Suggest fix based on operator precendence.) - #64943 (Add lower bound doctests for `saturating_{add,sub}` signed ints) - #64950 (Simplify interners) Failed merges: r? @ghost

@estebank

syntax: more cleanups in item and function signature parsing Follow up to rust-lang#64910. Best read commit-by-commit. r? @estebank

Centril added 8 commits September 30, 2019 03:31

syntax: cleanup method parsing.

f290467

syntax: is_named_argument -> is_named_param.

378cc98

syntax refactor parse_fn_params

4fa9c3b

syntax refactor parse_self_param (1)

40dc9da

syntax refactor parse_self_param (2)

f688f8a

syntax refactor parse_self_param (3)

ac454e9

syntax refactor parse_self_param (4)

4306d00

syntax refactor parse_self_param (5)

0492302

rust-highfive assigned petrochenkov Sep 30, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 30, 2019

syntax: reorder param parsing to make more sense.

347deac

Centril changed the title ~~syntax: cleanup parameter and method parsing~~ [WIP] syntax: cleanup parameter and method parsing Sep 30, 2019

Centril added 4 commits September 30, 2019 05:46

syntax: cleanup parse_fn_decl.

d9d0e5d

syntax: misc cleanup

5b80ead

syntax: cleanup parse_visibility.

66bf323

syntax: extract error_on_invalid_abi.

573a8d8

Centril changed the title ~~[WIP] syntax: cleanup parameter and method parsing~~ [WIP] syntax: cleanup param, method, and misc parsing Sep 30, 2019

Centril changed the title ~~[WIP] syntax: cleanup param, method, and misc parsing~~ syntax: cleanup param, method, and misc parsing Sep 30, 2019

Centril added 3 commits September 30, 2019 08:53

syntax: fuse more code paths together.

258e86a

syntax: stylistic cleanup in item parsing.

bea404f

syntax: reduce repetition in fn parsing.

151ce96

petrochenkov reviewed Sep 30, 2019

View reviewed changes

src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved

src/libsyntax/parse/parser/item.rs Outdated Show resolved Hide resolved

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 Sep 30, 2019

matthewjasper mentioned this pull request Sep 30, 2019

Add a raw "address of" operator #64588

Merged

syntax: document some methods.

df298b4

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 Oct 1, 2019

Centril mentioned this pull request Oct 1, 2019

Rollup of 4 pull requests #64951

Closed

Centril mentioned this pull request Oct 1, 2019

Rollup of 4 pull requests #64954

Closed

Centril mentioned this pull request Oct 1, 2019

Rollup of 5 pull requests #64955

Closed

Centril mentioned this pull request Oct 1, 2019

Rollup of 5 pull requests #64958

Closed

tmandry mentioned this pull request Oct 1, 2019

Rollup of 7 pull requests #64965

Closed

tmandry mentioned this pull request Oct 1, 2019

Rollup of 8 pull requests #64966

Closed

Centril mentioned this pull request Oct 1, 2019

Rollup of 8 pull requests #64971

Closed

Centril mentioned this pull request Oct 1, 2019

Rollup of 7 pull requests #64972

Merged

bors merged commit 5c5dd80 into rust-lang:master Oct 2, 2019

Centril deleted the params-cleanup branch October 2, 2019 16:24

Centril mentioned this pull request Oct 3, 2019

syntax: more cleanups in item and function signature parsing #65040

Merged

petrochenkov mentioned this pull request Oct 3, 2019

an empty :vis doesn't work in trait declaration #65041

Closed

Centril added a commit to Centril/rust that referenced this pull request Oct 8, 2019

Rollup merge of rust-lang#65040 - Centril:items-cleanup, r=estebank

4737095

syntax: more cleanups in item and function signature parsing Follow up to rust-lang#64910. Best read commit-by-commit. r? @estebank

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

syntax: cleanup param, method, and misc parsing #64910

syntax: cleanup param, method, and misc parsing #64910

Centril commented Sep 30, 2019 •

edited

Loading

petrochenkov commented Sep 30, 2019

petrochenkov commented Sep 30, 2019

petrochenkov commented Sep 30, 2019

petrochenkov commented Sep 30, 2019

bors commented Oct 1, 2019

syntax: cleanup param, method, and misc parsing #64910

syntax: cleanup param, method, and misc parsing #64910

Conversation

Centril commented Sep 30, 2019 • edited Loading

petrochenkov commented Sep 30, 2019

petrochenkov commented Sep 30, 2019

petrochenkov commented Sep 30, 2019

petrochenkov commented Sep 30, 2019

bors commented Oct 1, 2019

Centril commented Sep 30, 2019 •

edited

Loading