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

Rollup of 5 pull requests #61234

Closed
wants to merge 29 commits into from

Conversation

Projects
None yet
8 participants
@Centril
Copy link
Member

commented May 27, 2019

Successful merges:

  • #59627 (Improve miri error reporting in check_in_alloc)
  • #60827 (Use Symbol more in lint APIs)
  • #61084 (Clarify docs for unreachable! macro)
  • #61140 (Reword malformed attribute input diagnostics)
  • #61227 (Use .await syntax instead of await!)

Failed merges:

r? @ghost

LooMaclin and others added some commits Apr 2, 2019

Update src/librustc/mir/interpret/allocation.rs
Co-Authored-By: LooMaclin <loo.maclin@protonmail.com>
Reword malformed attribute input diagnostics
- Handle empty `cfg_attr` attribute
- Reword empty `derive` attribute error
- Use consistend error message: "malformed `attrname` attribute input"
- Provide suggestions when possible
- Move note/help to label/suggestion
- Use consistent wording "ill-formed" -> "malformed"
- Move diagnostic logic out of parser
Improve miri's error reporting in check_in_alloc
Co-Authored-By: Ralf Jung <post@ralfj.de>
Rollup merge of #59627 - LooMaclin:issue_57128_improve_miri_error_rep…
…orting_in_check_in_alloc, r=RalfJung

Improve miri error reporting in check_in_alloc

Fixes #57128

r? @RalfJung @oli-obk
Rollup merge of #60827 - oli-obk:late_symbol, r=nnethercote
Use `Symbol` more in lint APIs

r? @nnethercote

This will cause clippy breakage, but super trivial to fix since we can then remove the hacky `match_def_path` function that I added and go back to calling rustc's `match_def_path` method.
Rollup merge of #61084 - blkerby:unreachable_doc, r=KodrAus
Clarify docs for unreachable! macro

Fixes #60754.
Rollup merge of #61140 - estebank:attr-diagnostics, r=michaelwoerister
Reword malformed attribute input diagnostics

- Handle empty `cfg_attr` attribute
- Reword empty `derive` attribute error
- Use consistend error message: "malformed `attrname` attribute input"
- Provide suggestions when possible
- Move note/help to label/suggestion
- Use consistent wording "ill-formed" -> "malformed"
- Move diagnostic logic out of parser

Split up from #61026, where there's prior conversation.
Rollup merge of #61227 - diwic:patch-2, r=Centril
Use .await syntax instead of await!

Tiny doc fix.
@Centril

This comment has been minimized.

Copy link
Member Author

commented May 27, 2019

@bors r+ p=5 rollup=never

@bors

This comment has been minimized.

Copy link
Contributor

commented May 27, 2019

📌 Commit 88115b9 has been approved by Centril

@Centril Centril closed this May 27, 2019

@Centril Centril deleted the Centril:rollup-zn72xhe branch May 27, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.