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

Update description for error E0308 #78332

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Update description for error E0308 #78332

merged 1 commit into from
Oct 27, 2020

Conversation

PoignardAzur
Copy link
Contributor

@PoignardAzur PoignardAzur commented Oct 24, 2020 •
edited by camelid
Loading

Fixes #76462

r? @camelid

@rust-highfive
Copy link
Collaborator

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 24, 2020
camelid
camelid reviewed Oct 24, 2020
View reviewed changes
Copy link
Member

@camelid camelid left a comment

Choose a reason for hiding this comment

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

Looks good, thanks! Just a few nits :)

compiler/rustc_error_codes/src/error_codes/E0308.md Show resolved Hide resolved
compiler/rustc_error_codes/src/error_codes/E0308.md Outdated Show resolved Hide resolved
compiler/rustc_error_codes/src/error_codes/E0308.md Outdated Show resolved Hide resolved
@camelid camelid added A-error-codes Area: Explanation of an error code (--explain) C-enhancement Category: An issue proposing an enhancement or a PR with one. labels Oct 24, 2020
@camelid
Copy link
Member

camelid commented Oct 24, 2020

@PoignardAzur It looks like you will need to run:

$ ./x.py test src/test/ui/json-bom-plus-crlf-multifile.rs --bless && ./x.py test src/test/ui/json-bom-plus-crlf.rs --bless && ./x.py test src/test/ui/terminal-width/flag-json.rs --bless

@camelid
Copy link
Member

camelid commented Oct 25, 2020 •
edited
Loading

Thanks! This looks good :)

@jyn514 Can you r+?

@bors

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@jyn514
Copy link
Member

jyn514 commented Oct 25, 2020

@bors r=camelid rollup

@bors
Copy link
Contributor

bors commented Oct 25, 2020

📌 Commit 666afba has been approved by camelid

@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 25, 2020
@jyn514 jyn514 added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 25, 2020
@JohnTitor JohnTitor mentioned this pull request Oct 26, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 27, 2020
@bors
Auto merge of rust-lang#78421 - JohnTitor:rollup-bq2d7fo, r=JohnTitor
28f03ac 
Rollup of 16 pull requests

Successful merges:

 - rust-lang#76635 (Add [T]::as_chunks(_mut))
 - rust-lang#77703 (add system-llvm-libunwind config option)
 - rust-lang#78219 (Prefer to use `print_def_path`)
 - rust-lang#78298 (Add test for bad NLL higher-ranked subtype)
 - rust-lang#78332 (Update description for error E0308)
 - rust-lang#78342 (Use check-pass in single-use-lifetime ui tests)
 - rust-lang#78347 (Add lexicographical comparison doc)
 - rust-lang#78348 (Make some functions private that don't have to be public)
 - rust-lang#78349 (Use its own `TypeckResults` to avoid ICE)
 - rust-lang#78375 (Use ? in core/std macros)
 - rust-lang#78377 (Fix typo in debug statement)
 - rust-lang#78388 (Add some regression tests)
 - rust-lang#78394 (fix(docs): typo in BufWriter documentation)
 - rust-lang#78396 (Add compiler support for LLVM's x86_64 ERMSB feature)
 - rust-lang#78405 (Fix typo in lint description)
 - rust-lang#78412 (Improve formatting of hash collections docs)

Failed merges:

r? `@ghost`
@bors bors merged commit 0b72ca6 into rust-lang:master Oct 27, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 27, 2020
@PoignardAzur
Copy link
Contributor Author

Yaay

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camelid camelid camelid left review comments

Assignees

@camelid camelid

Labels
A-error-codes Area: Explanation of an error code (--explain) C-enhancement Category: An issue proposing an enhancement or a PR with one. 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.49.0
Development

Successfully merging this pull request may close these issues.

Error explanation for E0308 is incorrect and confusing
6 participants
@PoignardAzur @rust-highfive @camelid @bors @jyn514 @rustbot