The Wayback Machine - https://web.archive.org/web/20210806130720/https://github.com/rust-lang/rust/pull/87715
Skip to content

/ rust

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

Jump to bottom

Add long error explanation for E0625 #87715

Merged
merged 3 commits into from Aug 6, 2021
Merged

Add long error explanation for E0625 #87715

merged 3 commits into from Aug 6, 2021
+31 −2

Conversation

@bhgomes
Copy link
Contributor

@bhgomes bhgomes commented Aug 3, 2021

For #61137.
@bhgomes
add long error explanation for E0625
a77d6ff
@rust-highfive
Copy link
Collaborator

@rust-highfive rust-highfive commented Aug 3, 2021

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez
@rust-highfive
Copy link
Collaborator

@rust-highfive rust-highfive commented Aug 3, 2021

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

Please see the contribution instructions for more information.
@rust-log-analyzer

This comment has been hidden.

Sign in to view
@petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Aug 3, 2021

tidy error: /checkout/compiler/rustc_error_codes/src/error_codes/E0625.md: too many trailing newlines (2)
@bhgomes
remove trailing newline
2f85aa6
@GuillaumeGomez
GuillaumeGomez requested changes Aug 3, 2021
View changes
Copy link
Member

@GuillaumeGomez GuillaumeGomez left a comment

Please move the explanation after the failing example but otherwise looks good to me.
compiler/rustc_error_codes/src/error_codes/E0625.md Outdated Show resolved Hide resolved
@petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Aug 4, 2021

r? @GuillaumeGomez
@bhgomes
move full explanation to after erroneous example
dc5f6d2
@GuillaumeGomez
GuillaumeGomez approved these changes Aug 4, 2021
View changes
@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Aug 4, 2021

Thanks! r=me once CI pass
@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Aug 4, 2021

@bors: r+ rollup squash
@bors
Copy link
Contributor

@bors bors commented Aug 4, 2021

📌 Commit dc5f6d2 has been approved by GuillaumeGomez
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 5, 2021
@GuillaumeGomez
Rollup merge of rust-lang#87715 - bhgomes:long-explanation-E0625, r=G…
70e7d56 
…uillaumeGomez

Add long error explanation for E0625

For rust-lang#61137.
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 5, 2021
@GuillaumeGomez
Rollup merge of rust-lang#87715 - bhgomes:long-explanation-E0625, r=G…
637579c 
…uillaumeGomez

Add long error explanation for E0625

For rust-lang#61137.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 6, 2021
@JohnTitor
Rollup merge of rust-lang#87715 - bhgomes:long-explanation-E0625, r=G…
3f0fa2b 
…uillaumeGomez

Add long error explanation for E0625

For rust-lang#61137.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 6, 2021
@JohnTitor
Rollup merge of rust-lang#87715 - bhgomes:long-explanation-E0625, r=G…
4283b68 
…uillaumeGomez

Add long error explanation for E0625

For rust-lang#61137.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 6, 2021
@JohnTitor
Rollup merge of rust-lang#87715 - bhgomes:long-explanation-E0625, r=G…
f13c61d 
…uillaumeGomez

Add long error explanation for E0625

For rust-lang#61137.
@JohnTitor JohnTitor mentioned this pull request Aug 6, 2021
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 6, 2021
@bors
Auto merge of rust-lang#87806 - JohnTitor:rollup-sv6f6bg, r=JohnTitor
a83f4ae 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#87462 (Ignore comments in tidy-filelength)
 - rust-lang#87715 (Add long error explanation for E0625)
 - rust-lang#87727 (explicit_generic_args_with_impl_trait: fix min expected number of generics)
 - rust-lang#87742 (Validate FFI-safety warnings on naked functions)
 - rust-lang#87756 (Add back -Zno-profiler-runtime)
 - rust-lang#87759 (Re-use std::sealed::Sealed in os/linux/process.)
 - rust-lang#87760 (Promote `aarch64-apple-ios-sim` to Tier 2)
 - rust-lang#87770 (permit drop impls with generic constants in where clauses)
 - rust-lang#87779 (Remove special case for statement `NodeId` assignment)
 - rust-lang#87780 (alloc: Use intra doc links for the reserve function)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@JohnTitor JohnTitor mentioned this pull request Aug 6, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 6, 2021
@bors
Auto merge of rust-lang#87808 - JohnTitor:rollup-qqp79xs, r=JohnTitor
1f94abc 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#87561 (thread set_name haiku implementation.)
 - rust-lang#87715 (Add long error explanation for E0625)
 - rust-lang#87727 (explicit_generic_args_with_impl_trait: fix min expected number of generics)
 - rust-lang#87742 (Validate FFI-safety warnings on naked functions)
 - rust-lang#87756 (Add back -Zno-profiler-runtime)
 - rust-lang#87759 (Re-use std::sealed::Sealed in os/linux/process.)
 - rust-lang#87760 (Promote `aarch64-apple-ios-sim` to Tier 2)
 - rust-lang#87770 (permit drop impls with generic constants in where clauses)
 - rust-lang#87780 (alloc: Use intra doc links for the reserve function)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 772db06 into rust-lang:master Aug 6, 2021
10 checks passed
10 checks passed
@github-actions
PR (mingw-check, ubuntu-latest-xl)
Details
@github-actions
PR (x86_64-gnu-llvm-10, ubuntu-latest-xl)
Details
@github-actions
PR (x86_64-gnu-tools, 1, ubuntu-latest-xl)
Details
@github-actions
auto
Details
@github-actions
try
Details
@github-actions
master
Details
@github-actions
bors build finished
Details
@github-actions
bors build finished
Details
@github-actions
bors build finished
Details
@github-actions
bors build finished
Details
@rustbot rustbot added this to the 1.56.0 milestone Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors
7 participants
@bhgomes @rust-highfive @rust-log-analyzer @petrochenkov @GuillaumeGomez @bors @rustbot