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 #63926

Merged
merged 52 commits into from
Aug 27, 2019
Merged

Rollup of 6 pull requests #63926

merged 52 commits into from
Aug 27, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 26, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 30 commits August 21, 2019 16:12
VxWorks does not provide a way to set the task name except at creation time
Feature gate definitions were split into multiple files in rust-lang#63824 but
tidy kept reporting the hard-coded path. Now, it shows the full path
to the correct file.
This is just in preparation for future usage of these texts.
Centril and others added 19 commits August 24, 2019 23:05
This replaces the ad-hoc tuples used in the different feature gate files
and unifies their content into a common type, leading to more readable
matches and other good stuff that comes from having named fields. It
also contains the description of each feature as extracted from the doc
comment.
Tries to clarify the filtering of active features and make the code more
expressive.
Do not complain about unused code when used in `impl` `Self` type

Fix rust-lang#18290.
…ebank

Fully implement or-pattern parsing

Builds upon the initial parsing in rust-lang#61708 to fully implement or-pattern (`p | q`) parsing as specified in [the grammar section of RFC 2535](https://github.com/rust-lang/rfcs/blob/master/text/2535-or-patterns.md#grammar).

Noteworthy:

- We allow or-patterns in `[p | q, ...]`.
- We allow or-patterns in `let` statements and `for` expressions including with leading `|`.
- We improve recovery for `p || q` (+ tests for that in `multiple-pattern-typo.rs`).
- We improve recovery for `| p | q` in inner patterns (tests in `or-patterns-syntactic-fail.rs`).
- We rigorously test or-pattern parsing (in `or-patterns-syntactic-{pass,fail}.rs`).
- We harden the feature gating tests.
- We do **_not_** change `ast.rs`. That is, `ExprKind::Let.0` and `Arm.pats` still accept `Vec<P<Pat>>`.
   I was starting work on that but it would be cleaner to do this in a separate PR so this one has a narrower scope.

cc @dlrobertson
cc the tracking issue rust-lang#54883.

r? @estebank
VxWorks does not provide a way to set the task name except at creation time

Make set_name do thing as VxWorks does not provide a way to set the task name except at creation time.

r? @alexcrichton

cc @n-salim
…nikomatsakis

Removed a confusing FnOnce example

# Description
See rust-lang#47091 for a discussion.

## Changes
- Removed an example that might suggest readers that square_x is (only) FnOnce.

closes rust-lang#47091
…=Centril

Refactor feature gates

After rust-lang#63824, this goes a few steps further by

- parsing doc comments in the macros to extract descriptions for feature gates, and
- introducing a common `Feature` type to replace the tuples used previously to improve readability.

The descriptions are not yet used, but I felt like this PR is a useful enough refactoring on its own.

r? @Centril
add link to FileCheck docs

Thanks @gnzlbg for pointing me to those docs.
@Centril
Copy link
Contributor Author

Centril commented Aug 26, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Aug 26, 2019

📌 Commit 9c5c124 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 Aug 26, 2019
@bors
Copy link
Contributor

bors commented Aug 27, 2019

⌛ Testing commit 9c5c124 with merge 0444b9f...

bors added a commit that referenced this pull request Aug 27, 2019
Rollup of 6 pull requests

Successful merges:

 - #63317 (Do not complain about unused code when used in `impl` `Self` type)
 - #63693 (Fully implement or-pattern parsing)
 - #63836 (VxWorks does not provide a way to set the task name except at creation time)
 - #63845 (Removed a confusing FnOnce example)
 - #63855 (Refactor feature gates)
 - #63921 (add link to FileCheck docs)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 27, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 27, 2019
@bors bors merged commit 9c5c124 into rust-lang:master Aug 27, 2019
@Centril Centril deleted the rollup-6kckn9n branch August 27, 2019 03:55
@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.

None yet

7 participants