Refactor type & bounds parsing thoroughly #67148
Merged
Conversation
This file contains 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
rust-highfive
added
the
S-waiting-on-review
petrochenkov
reviewed
Dec 8, 2019
| self.error_opt_out_lifetime(question); | ||
| let bound = GenericBound::Outlives(self.expect_lifetime()); | ||
| if has_parens { | ||
| // FIXME(Centril): Consider not erroring here and accepting `('lt)` instead, |
There was a problem hiding this comment.
('lt) is entirely useless and it's some PITA to parse it in the first trait object position like type A = ('lt) + OtherBounds, so it isn't accepted anywhere.
|
I still feel like half of these changes (extracting small functions used once) make code readability worse, but you are the primary person working with this code now, so feel free to adjust it to your personal tastes basically. |
This comment has been minimized.
This comment has been minimized.
Centril
force-pushed
the
ty-polish
branch
2 times, most recently
from
d345958 to
d977e5b
Compare
|
#67131 has merged & I've rebased this PR so it should be ready for review now. |
estebank
approved these changes
Dec 21, 2019
|
Addressed the comments in the two commits above, @bors r=estebank |
|
📌 Commit 690b0b3 has been approved by |
|
🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 21, 2019
Refactor type & bounds parsing thoroughly PR is based on rust-lang#67131 with first one from this PR being ` extract parse_ty_tuple_or_parens`. Also fixes rust-lang#67146. r? @estebank
This comment has been minimized.
This comment has been minimized.
bors
added
S-waiting-on-author
|
@bors r=estebank |
|
📌 Commit db4818f has been approved by |
|
🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 22, 2019
Refactor type & bounds parsing thoroughly PR is based on rust-lang#67131 with first one from this PR being ` extract parse_ty_tuple_or_parens`. Also fixes rust-lang#67146. r? @estebank
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 22, 2019
Refactor type & bounds parsing thoroughly PR is based on rust-lang#67131 with first one from this PR being ` extract parse_ty_tuple_or_parens`. Also fixes rust-lang#67146. r? @estebank
bors
added a commit
that referenced
this pull request
Dec 22, 2019
Rollup of 6 pull requests Successful merges: - #67148 ( Refactor type & bounds parsing thoroughly) - #67410 (Reenable static linking of libstdc++ on windows-gnu) - #67439 (Cleanup `lower_pattern_unadjusted` & Improve slice pat typeck) - #67480 (Require issue = "none" over issue = "0" in unstable attributes) - #67500 (Tweak non_shorthand_field_patterns' suggestion) - #67504 (Warn against relying on ?Sized being last) Failed merges: r? @ghost
This was referenced Feb 8, 2020
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 10, 2020
change an instance of span_bug() to struct_span_err() to avoid ICE After rust-lang#67148, the `span_bug()` in `parse_ty_tuple_or_parens()` is reachable because `parse_paren_comma_seq()` can return an `Ok()` even in cases where it encounters an error. This pull request prevents an ICE in such cases by replacing the `span_bug()` with `struct_span_error()`. Fixes rust-lang#68890.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR is based on #67131 with first one from this PR being
extract parse_ty_tuple_or_parens.Also fixes #67146.
r? @estebank