Skip to content

Rollup of 4 pull requests #78106

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 9 commits into from
Oct 19, 2020
Merged

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

scottmcm and others added 9 commits October 12, 2020 16:17
To pick up rust-lang/rustfmt#4461
So that rustfmt has the parsing fix from rust-lang#76274

...and do a reformat that it wants.
…erences, r=shepmaster

Use `try{}` in `try_fold` to decouple iterators in the library from `Try` details

I'd like to experiment with changing the `?`/`try` desugaring and correspondingly the `Try` trait (see rust-lang#42327 for discussions about the suboptimalities of the current one) and this change would keep from needing any `cfg(bootstrap)` in iterator things.

This will be lowered to the same thing, so shouldn't cause any perf issues:
https://github.com/rust-lang/rust/blob/08e2d4616613716362b4b49980ff303f2b9ae654/compiler/rustc_ast_lowering/src/expr.rs#L428-L429

But ~~I'll trigger~~ I've triggered [a perf run](https://perf.rust-lang.org/compare.html?start=d65c08e9cc164b7b44de53503fae859a4fafd976&end=2c067c5235e779cd75e9f0cdfe572c64f1a12b9b) just in case.

~~EDIT: changed to a draft because of the rustfmt-only syntax error.  zulip thread about it: https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/New.20bootstrap.20rustfmt.20doesn't.20support.20syntax.20from.20sept.3F/near/213098097~~

EDIT: This now includes a rustfmt version bump to get through tidy.
…lcnr

Fix issue with specifying generic arguments for primitive types

Fixes rust-lang#78005.

r? @lcnr
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=4

@bors
Copy link
Collaborator

bors commented Oct 19, 2020

📌 Commit cbcf8d4 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 19, 2020
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Oct 19, 2020
@bors
Copy link
Collaborator

bors commented Oct 19, 2020

⌛ Testing commit cbcf8d4 with merge a85e949...

@bors
Copy link
Collaborator

bors commented Oct 19, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: GuillaumeGomez
Pushing a85e949 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 19, 2020
@bors bors merged commit a85e949 into rust-lang:master Oct 19, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 19, 2020
@GuillaumeGomez GuillaumeGomez deleted the rollup-06vwk7p branch October 19, 2020 20:40
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants