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

Revert invalid fn return type parsing change #78523

Merged
merged 2 commits into from
Oct 30, 2020
Merged

Revert invalid fn return type parsing change #78523

merged 2 commits into from
Oct 30, 2020

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Oct 29, 2020 •
edited
Loading

Revert one of the changes in #78379.

Fix #78507.

@rust-highfive
Copy link
Collaborator

r? @eddyb

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

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

r? @varkor

@rust-highfive rust-highfive assigned varkor and unassigned eddyb Oct 29, 2020
@estebank estebank mentioned this pull request Oct 29, 2020
Closed
@dtolnay
Copy link
Member

dtolnay commented Oct 29, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2020

📌 Commit 9ae7130 has been approved by dtolnay

@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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2020
@jyn514 jyn514 added A-parser Area: The 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
@JohnTitor JohnTitor mentioned this pull request Oct 30, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 30, 2020
@bors
Auto merge of rust-lang#78562 - JohnTitor:rollup-otg906u, r=JohnTitor
388ef34 
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:master Oct 30, 2020
@rustbot rustbot 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
@dtolnay dtolnay assigned dtolnay and unassigned varkor Mar 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
A-parser Area: The parsing of Rust source code to an AST 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.49.0
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