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

Reword E0392 slightly #64931

Merged
merged 2 commits into from
Oct 3, 2019
Merged

Reword E0392 slightly #64931

merged 2 commits into from
Oct 3, 2019

Conversation

estebank
Copy link
Contributor

Make it clearer that a type or lifetime argument not being used can be
fixed by referencing it in a struct's fields, not just using PhathomData.

CC #53589.

Make it clearer that a type or lifetime argument not being used can be
fixed by referencing it in a struct's fields, not just using `PhathomData`.
@rust-highfive
Copy link
Collaborator

r? @matthewjasper

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 30, 2019
@matthewjasper
Copy link
Contributor

r=me with Centril's comment addressed

@Centril
Copy link
Contributor

Centril commented Oct 2, 2019

Seems like some submodules were accidentally updated?

@estebank
Copy link
Contributor Author

estebank commented Oct 2, 2019

@Centril sigh, cleaned up

@Centril
Copy link
Contributor

Centril commented Oct 2, 2019

@bors r=matthewjasper,Centril rollup

@bors
Copy link
Contributor

bors commented Oct 2, 2019

📌 Commit a180294 has been approved by matthewjasper,Centril

@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 Oct 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 2, 2019
…ewjasper,Centril

Reword E0392 slightly

Make it clearer that a type or lifetime argument not being used can be
fixed by referencing it in a struct's fields, not just using `PhathomData`.

CC rust-lang#53589.
Centril added a commit to Centril/rust that referenced this pull request Oct 3, 2019
…ewjasper,Centril

Reword E0392 slightly

Make it clearer that a type or lifetime argument not being used can be
fixed by referencing it in a struct's fields, not just using `PhathomData`.

CC rust-lang#53589.
bors added a commit that referenced this pull request Oct 3, 2019
Rollup of 7 pull requests

Successful merges:

 - #63678 (Improve HRTB error span when -Zno-leak-check is used)
 - #64931 (Reword E0392 slightly)
 - #64959 (syntax: improve parameter without type suggestions)
 - #64975 (Implement Clone::clone_from for LinkedList)
 - #64993 (BacktraceStatus: add Eq impl)
 - #64998 (Filter out RLS output directories on tidy runs)
 - #65010 (Compare `primary` with maximum of `children`s' line num instead of dropping it)

Failed merges:

r? @ghost
}
let msg = if let Some(def_id) = suggested_marker_id {
format!(
"consider removing `{}`, refering to it in a field, or using a marker such as `{}`",
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be referring?

Copy link
Contributor

Choose a reason for hiding this comment

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

And so on in other locations.

Copy link
Contributor

@Centril Centril Oct 3, 2019

Choose a reason for hiding this comment

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

It should yes, but let's fix it in a follow-up (pending rollup...)

@bors bors merged commit a180294 into rust-lang:master Oct 3, 2019
mathstuf added a commit to mathstuf/rust that referenced this pull request Oct 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 3, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 3, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants