Skip to content

Revert invalid fn return type parsing change - #78523

Merged
bors merged 2 commits into
rust-lang:masterfrom
estebank:fix-return-type-parse-regression
Oct 30, 2020
Merged

Revert invalid fn return type parsing change#78523
bors merged 2 commits into
rust-lang:masterfrom
estebank:fix-return-type-parse-regression

Conversation

@estebank

@estebankestebank commented Oct 29, 2020

Copy link
Copy Markdown
Contributor

Revert one of the changes in #78379.

Fix#78507.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 29, 2020
@estebank

Copy link
Copy Markdown
ContributorAuthor

r? @varkor

@dtolnay

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Oct 29, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9ae7130 has been approved by dtolnay

@borsbors 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 Oct 29, 2020
@jyn514jyn514 added A-parser Area: The lexing & parsing of Rust source code to an AST T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 29, 2020
@JohnTitorJohnTitor mentioned this pull request Oct 30, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 30, 2020
Rollup of 8 pull requests
Successful merges:
- rust-lang#77334 (Reorder benches const variable)
- rust-lang#77888 (Simplify a nested bool match)
- rust-lang#77921 (f64: Refactor collapsible_if)
- rust-lang#78523 (Revert invalid `fn` return type parsing change)
- rust-lang#78524 (Avoid BorrowMutError with RUSTC_LOG=debug)
- rust-lang#78545 (Make anonymous binders start at 0)
- rust-lang#78554 (Improve wording of `core::ptr::drop_in_place` docs)
- rust-lang#78556 (Link to pass docs from NRVO module docs)
Failed merges:
- rust-lang#78424 (Fix some more clippy warnings)
r? `@ghost`
@bors
bors merged commit 8111706 into rust-lang:masterOct 30, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 30, 2020
@estebank
estebank deleted the fix-return-type-parse-regression branch November 9, 2023 05:16
@dtolnaydtolnay assigned dtolnay and unassigned varkorMar 24, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-parserArea: The lexing & parsing of Rust source code to an ASTS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Regression parsing closing angle brackets near function ptr return type

8 participants

@estebank@rust-highfive@dtolnay@bors@eddyb@varkor@jyn514@rustbot