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.

Sign up for GitHub

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

Jump to bottom

Recover _ as .. in field pattern #106919

Merged
merged 1 commit into from
Feb 2, 2023
Merged

Recover _ as .. in field pattern #106919

merged 1 commit into from
Feb 2, 2023

Conversation

compiler-errors
Copy link
Member

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Jan 15, 2023

r? @jackh726

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 15, 2023
jackh726
jackh726 approved these changes Jan 29, 2023
View reviewed changes
Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me after comment updated

compiler/rustc_parse/src/parser/pat.rs Show resolved Hide resolved
@compiler-errors compiler-errors force-pushed the underscore-typo-in-field-pat branch from 9c4a9d0 to 72419ef Compare January 29, 2023 19:36
@compiler-errors
Copy link
Member Author

@bors r=jackh726

@bors
Copy link
Contributor

bors commented Feb 1, 2023

📌 Commit 72419ef has been approved by jackh726

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 1, 2023

🌲 The tree is currently closed for pull requests below priority 50. 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 Feb 1, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Feb 2, 2023
@compiler-errors
Rollup merge of rust-lang#106919 - compiler-errors:underscore-typo-in…
c8f7387 
…-field-pat, r=jackh726

Recover `_` as `..` in field pattern
@compiler-errors compiler-errors mentioned this pull request Feb 2, 2023
Closed
@bors
Copy link
Contributor

bors commented Feb 2, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout underscore-typo-in-field-pat (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self underscore-typo-in-field-pat --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging compiler/rustc_parse/src/parser/pat.rs
CONFLICT (content): Merge conflict in compiler/rustc_parse/src/parser/pat.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 2, 2023
@bors
Copy link
Contributor

bors commented Feb 2, 2023

☔ The latest upstream changes (presumably #105670) made this pull request unmergeable. Please resolve the merge conflicts.

@compiler-errors compiler-errors force-pushed the underscore-typo-in-field-pat branch from 72419ef to 9dd5d3e Compare February 2, 2023 06:10
@rustbot rustbot added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Feb 2, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 2, 2023

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@compiler-errors
Copy link
Member Author

compiler-errors commented Feb 2, 2023 •
edited
Loading

Rebased to use the new diagnostic struct in #105670

@bors r=jackh726

@bors
Copy link
Contributor

bors commented Feb 2, 2023

📌 Commit 9dd5d3e has been approved by jackh726

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 2, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 2, 2023
@Dylan-DPC
Rollup merge of rust-lang#106919 - compiler-errors:underscore-typo-in…
faaef82 
…-field-pat, r=jackh726

Recover `_` as `..` in field pattern
@Dylan-DPC Dylan-DPC mentioned this pull request Feb 2, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 2, 2023
@matthiaskrgr
Rollup merge of rust-lang#106919 - compiler-errors:underscore-typo-in…
6e7cb8f 
…-field-pat, r=jackh726

Recover `_` as `..` in field pattern
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 2, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 2, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2023
@bors
Auto merge of rust-lang#107601 - matthiaskrgr:rollup-07zaafe, r=matth…
f312650 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#106919 (Recover `_` as `..` in field pattern)
 - rust-lang#107493 (Improve diagnostic for missing space in range pattern)
 - rust-lang#107515 (Improve pretty-printing of `HirIdValidator` errors)
 - rust-lang#107524 (Remove both StorageLive and StorageDead in CopyProp.)
 - rust-lang#107532 (Erase regions before doing uninhabited check in borrowck)
 - rust-lang#107559 (Rename `rust_2015` → `is_rust_2015`)
 - rust-lang#107577 (Reinstate the `hir-stats.rs` tests on stage 1.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8f47954 into rust-lang:master Feb 2, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 2, 2023
@compiler-errors compiler-errors deleted the underscore-typo-in-field-pat branch August 11, 2023 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackh726 jackh726 jackh726 approved these changes

Assignees

@jackh726 jackh726

Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.
4 participants
@compiler-errors @rustbot @bors @jackh726