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.

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

Rollup of 6 pull requests #67271

Merged
merged 12 commits into from
Dec 13, 2019
Merged

Rollup of 6 pull requests #67271

merged 12 commits into from
Dec 13, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 13, 2019

Successful merges:

Failed merges:

r? @ghost

crgl and others added 12 commits November 13, 2019 11:56
Because it's unused. This then allows the removal of
`MatcherPos::sp_open`. It's a tiny perf win, reducing instruction counts
by 0.1% - 0.2% on a few benchmarks.
Match `VecDeque::extend` to `Vec::extend_desugared`

Currently, `VecDeque::extend` [does not reserve at all](rust-lang#65069 (comment)). This implementation still runs a check every iteration of the loop, but should reallocate at most once for the common cases where the `size_hint` lower bound is exact. Further optimizations in the future could improve this for some common cases, but given the complexity of the `Vec::extend` implementation it's not immediately clear that this would be worthwhile.
…KodrAus

LinkedList: drop remaining items when drop panics

rust-lang#67235, but for `LinkedList`, which has the same issue.

I've also copied over the other drop-related tests from `VecDeque` since AFAICT `LinkedList` didn't have any.
…Match-MatchedSeq, r=Centril

Remove the `DelimSpan` from `NamedMatch::MatchedSeq`.

Because it's unused. This then allows the removal of
`MatcherPos::sp_open`. It's a tiny perf win, reducing instruction counts
by 0.1% - 0.2% on a few benchmarks.

r? @Centril
Require `allow_internal_unstable` for stable min_const_fn using unsta…

…ble features

r? @Centril

cc @ecstatic-morse @RalfJung
…ebank

parser: recover on `&'lifetime mut? $pat`.

r? @estebank
@Centril
Copy link
Contributor Author

Centril commented Dec 13, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Dec 13, 2019

📌 Commit d25197c has been approved by Centril

@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 Dec 13, 2019
@Centril Centril added the rollup A PR which is a rollup label Dec 13, 2019
@bors
Copy link
Contributor

bors commented Dec 13, 2019

⌛ Testing commit d25197c with merge cf7e019...

bors added a commit that referenced this pull request Dec 13, 2019
Rollup of 6 pull requests

Successful merges:

 - #66341 (Match `VecDeque::extend` to `Vec::extend_desugared`)
 - #67243 (LinkedList: drop remaining items when drop panics)
 - #67247 (Don't suggest wrong snippet in closure)
 - #67250 (Remove the `DelimSpan` from `NamedMatch::MatchedSeq`.)
 - #67251 (Require `allow_internal_unstable` for stable min_const_fn using unsta…)
 - #67269 (parser: recover on `&'lifetime mut? $pat`.)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 13, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing cf7e019 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 13, 2019
@bors bors merged commit d25197c into rust-lang:master Dec 13, 2019
@Centril Centril deleted the rollup-i71iqkv branch December 13, 2019 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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