Skip to content

unify IsPattern and IsImport enum in show_candidates - #102913

Merged
bors merged 1 commit into
rust-lang:masterfrom
SparrowLii:import-candidate
Oct 12, 2022
Merged

unify IsPattern and IsImport enum in show_candidates#102913
bors merged 1 commit into
rust-lang:masterfrom
SparrowLii:import-candidate

Conversation

@SparrowLii

@SparrowLiiSparrowLii commented Oct 11, 2022

Copy link
Copy Markdown
Member

Follow-up of #102876
A binding cannot appear in both pattern and import at the same time, so it makes sense to unify them
r? @compiler-errors

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 11, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 11, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe DiagnosticMode? r=me after giving it a better name than just Mode.

@SparrowLiiSparrowLiiOct 12, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Done. But I don't have privileges, so I still need you to r+

@SparrowLii

Copy link
Copy Markdown
MemberAuthor

@bors r=compiler-errors

@bors

bors commented Oct 12, 2022

Copy link
Copy Markdown
Collaborator

@SparrowLii: 🔑 Insufficient privileges: Not in reviewers

@compiler-errors

Copy link
Copy Markdown
Contributor

I will r+ it once CI turns green.

@compiler-errors

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Oct 12, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit a7f58af has been approved by compiler-errors

It is now in the queue for this repository.

@borsbors 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 Oct 12, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Oct 12, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2022
Rollup of 8 pull requests
Successful merges:
- rust-lang#102110 (Migrate rustc_passes diagnostics)
- rust-lang#102187 (Use correct location for type tests in promoted constants)
- rust-lang#102239 (Move style guide to rust-lang/rust)
- rust-lang#102578 (Panic for invalid arguments of `{integer primitive}::ilog{,2,10}` in all modes)
- rust-lang#102811 (Use memset to initialize readbuf)
- rust-lang#102890 (Check representability in adt_sized_constraint)
- rust-lang#102913 (unify `IsPattern` and `IsImport` enum in `show_candidates`)
- rust-lang#102924 (rustdoc: remove unused classes from sidebar links)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 252ce10 into rust-lang:masterOct 12, 2022
@rustbotrustbot added this to the 1.66.0 milestone Oct 12, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@SparrowLii@bors@compiler-errors@rust-highfive@rustbot