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

resolve, inconsistent binding mode: tweak wording #69687

Merged
merged 1 commit into from
Mar 8, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 4, 2020

Now that we can have e.g. let Ok(x) | Err(x) = res;, it's no longer appropriate to refer to "the same match arm", so let's tweak the wording.

r? @estebank

@Centril Centril added the F-or_patterns `#![feature(or_patterns)]` label Mar 4, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 4, 2020
@Centril
Copy link
Contributor Author

Centril commented Mar 6, 2020

r? @davidtwco

@rust-highfive rust-highfive assigned davidtwco and unassigned estebank Mar 6, 2020
@estebank
Copy link
Contributor

estebank commented Mar 6, 2020

r? @estebank bors r+

@rust-highfive rust-highfive assigned estebank and unassigned davidtwco Mar 6, 2020
@Centril
Copy link
Contributor Author

Centril commented Mar 7, 2020

@bors r=estebank

@bors
Copy link
Contributor

bors commented Mar 7, 2020

📌 Commit cc9aad4 has been approved by estebank

@bors
Copy link
Contributor

bors commented Mar 7, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Mar 7, 2020
bors added a commit that referenced this pull request Mar 8, 2020
Rollup of 8 pull requests

Successful merges:

 - #69667 (Remove the `no_debug` feature)
 - #69687 (resolve, inconsistent binding mode: tweak wording)
 - #69708 (On mismatched delimiters, only point at empty blocks that are in the same line)
 - #69765 (reduce test size for Miri)
 - #69773 (fix various typos)
 - #69787 (mir::Local is Copy we can pass it by value in these cases)
 - #69794 (Add `Layout::dangling()` to return a well-aligned `NonNull<u8>`)
 - #69797 (Correct version that relaxed orphan rules)

Failed merges:

r? @ghost
@bors bors merged commit 289c3a5 into rust-lang:master Mar 8, 2020
@Centril Centril deleted the bm-inconsistent-wording branch March 8, 2020 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
F-or_patterns `#![feature(or_patterns)]` 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.

5 participants