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 5 pull requests #64313

Merged
merged 10 commits into from
Sep 9, 2019
Merged

Rollup of 5 pull requests #64313

merged 10 commits into from
Sep 9, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 9, 2019

Successful merges:

Failed merges:

r? @ghost

timvermeulen and others added 10 commits September 4, 2019 14:12
Arm, Field, FieldPat, GenericParam, Param, StructField and Variant
Resolve attributes in several places

Resolve attributes for Arm, Field, FieldPat, GenericParam, Param, StructField and Variant.

This PR is based on @petrochenkov work located at petrochenkov@83fdb8d.
… r=scottmcm

Override `StepBy::{try_fold, try_rfold}`

Previous PR: rust-lang#51435

The previous PR was closed in favor of rust-lang#51601, which was later reverted. I don't think these implementations will make it harder to specialize `StepBy<Range<_>>` later, so we should be able to land this without any consequences.

This should fix rust-lang#57517 – in my benchmarks `iter` and `iter.step_by(1)` now perform equally well, provided internal iteration is used.
…andling, r=Mark-Simulacrum

Unify escape usage

Fixes rust-lang#63443.

I chose to keep the search text when pressing escape so when we focus on the search bar, we got the results again without needing to load them again. I also unified a bit a few things (maybe I should have done it in another commit, sorry...).

r? @Mark-Simulacrum
@Centril
Copy link
Contributor Author

Centril commented Sep 9, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Sep 9, 2019

📌 Commit f7ee130 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 Sep 9, 2019
@bors
Copy link
Contributor

bors commented Sep 9, 2019

⌛ Testing commit f7ee130 with merge 0b36e9d...

bors added a commit that referenced this pull request Sep 9, 2019
Rollup of 5 pull requests

Successful merges:

 - #63468 (Resolve attributes in several places)
 - #64121 (Override `StepBy::{try_fold, try_rfold}`)
 - #64278 (check git in bootstrap.py)
 - #64306 (Fix typo in config.toml.example)
 - #64312 (Unify escape usage)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 9, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 9, 2019
@bors bors merged commit f7ee130 into rust-lang:master Sep 9, 2019
@Centril Centril deleted the rollup-7w8b67g branch September 9, 2019 20:24
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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.

6 participants