Skip to content

Mention "signature" rather than "fn pointer" when impl/trait methods are incompatible#106131

Merged
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:not-ptrs
Jan 9, 2023
Merged

Mention "signature" rather than "fn pointer" when impl/trait methods are incompatible#106131
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:not-ptrs

Conversation

@compiler-errors

@compiler-errors compiler-errors commented Dec 24, 2022

Copy link
Copy Markdown
Contributor

Fixes #80929
Fixes #67296

@compiler-errors compiler-errors marked this pull request as ready for review December 24, 2022 23:23
@rustbot

rustbot commented Dec 24, 2022

Copy link
Copy Markdown
Collaborator

r? @davidtwco

(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 Dec 24, 2022
@bors

This comment was marked as resolved.

@davidtwco

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 7, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 117b8b44b232bc44d3c3a69e1e679a6aa086f910 has been approved by davidtwco

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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 7, 2023
@bors

bors commented Jan 8, 2023

Copy link
Copy Markdown
Collaborator

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

@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 Jan 8, 2023
@rustbot rustbot added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Jan 8, 2023
@rustbot

rustbot commented Jan 8, 2023

Copy link
Copy Markdown
Collaborator

rustc_error_messages was changed

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

@compiler-errors

Copy link
Copy Markdown
Contributor Author

@bors r=davidtwco

@bors

bors commented Jan 8, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 49f849a has been approved by davidtwco

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 Jan 8, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 9, 2023
Mention "signature" rather than "fn pointer" when impl/trait methods are incompatible

Fixes rust-lang#80929
Fixes rust-lang#67296
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2023
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#104163 (Don't derive Debug for `OnceWith` & `RepeatWith`)
 - rust-lang#106131 (Mention "signature" rather than "fn pointer" when impl/trait methods are incompatible)
 - rust-lang#106363 (Structured suggestion for `&mut dyn Iterator` when possible)
 - rust-lang#106497 (Suggest using clone when we have &T and T implemented Clone)
 - rust-lang#106584 (Document that `Vec::from_raw_parts[_in]` must be given a pointer from the correct allocator.)
 - rust-lang#106600 (Suppress type errors that come from private fields)
 - rust-lang#106602 (Add goml scripts to tidy checks)
 - rust-lang#106606 (Do not emit structured suggestion for turbofish with wrong span)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6afd161 into rust-lang:master Jan 9, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 9, 2023
@compiler-errors compiler-errors deleted the not-ptrs branch August 11, 2023 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

Diagnostic refers to incorrect trait method as "fn pointer" Diagnostics talk about fn pointer when no pointers are in the source

4 participants