Skip to content

Update description for error E0308 - #78332

Merged
bors merged 1 commit into
rust-lang:masterfrom
PoignardAzur:doc_E0308
Oct 27, 2020
Merged

Update description for error E0308#78332
bors merged 1 commit into
rust-lang:masterfrom
PoignardAzur:doc_E0308

Conversation

@PoignardAzur

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

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented Oct 24, 2020

Copy link
Copy Markdown
Contributor

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-highfiverust-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

@camelidcamelid left a comment

Copy link
Copy Markdown
Member

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 :)

Comment threadcompiler/rustc_error_codes/src/error_codes/E0308.md Outdated
Comment threadcompiler/rustc_error_codes/src/error_codes/E0308.md Outdated
Comment threadcompiler/rustc_error_codes/src/error_codes/E0308.md Outdated
camelid
camelid reviewed Oct 24, 2020
View reviewed changes
Comment threadcompiler/rustc_error_codes/src/error_codes/E0308.md Outdated
@camelidcamelid 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

camelid commented Oct 24, 2020

Copy link
Copy Markdown
Member

@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

camelid commented Oct 25, 2020•
edited
Loading

Copy link
Copy Markdown
Member

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

jyn514 commented Oct 25, 2020

Copy link
Copy Markdown
Member

@bors r=camelid rollup

@bors

bors commented Oct 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 666afba has been approved by camelid

@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 25, 2020
@jyn514jyn514 added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 25, 2020
@JohnTitorJohnTitor 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 ofrust-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:masterOct 27, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 27, 2020
@PoignardAzur

PoignardAzur commented Oct 27, 2020

Copy link
Copy Markdown
ContributorAuthor

Yaay

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

Reviewers

@camelidcamelidcamelid left review comments

Assignees

@camelidcamelid

Labels

A-error-codesArea: Explanation of an error code (--explain)C-enhancementCategory: An issue proposing an enhancement or a PR with one.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

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