emit error with span for empty asserts#56491

euclio · 2018-12-04T02:07:45Z

Fixes #55547.

rust-highfive · 2018-12-04T02:07:48Z

r? @aturon

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

euclio · 2018-12-04T02:08:11Z

r? @estebank

estebank · 2018-12-04T02:16:55Z

src/libsyntax_ext/assert.rs

Thanks for the change!

Could you change this to something closer to

cx.struct_span_err(sp, "macro call requires boolean expression as argument") .span_label(sp, "boolean expression required") .emit();

Ideally you'd add a Applicability::MaybeIncorrect suggestion as well showing what the correct code would be, but that'd be overkill for this.

Fixes rust-lang#55547.

estebank · 2018-12-10T18:38:45Z

src/test/ui/macros/assert.stderr

+  --> $DIR/assert.rs:2:5
+   |
+LL |     assert!();  //~ ERROR requires a boolean expression
+   |     ^^^^^^^^^^ boolean expression required


It'd be nice to point at the (empty) argument list, but this is already quite an improvement.

estebank · 2018-12-10T18:38:54Z

@bors r+ rollup

bors · 2018-12-10T18:38:55Z

📌 Commit a367cec has been approved by estebank

emit error with span for empty asserts Fixes rust-lang#55547.

@ghost

Rollup of 5 pull requests Successful merges: - #56491 (emit error with span for empty asserts) - #56633 (Fix right arrow size for crate filter) - #56641 (fix span for invalid number of parameters in trait method) - #56656 (Fix typo) - #56661 (Add regression test for ICE) Failed merges: r? @ghost

This commit completely removes usage of the `panictry!` macro from outside libsyntax. The macro causes parse errors to be fatal, so using it in libsyntax_ext caused parse failures *within* a syntax extension to be fatal, which is probably not intended. Furthermore, this commit adds spans to diagnostics emitted by empty extensions if they were missing, à la rust-lang#56491.

make `panictry!` private to libsyntax This commit completely removes usage of the `panictry!` macro from outside libsyntax. The macro causes parse errors to be fatal, so using it in libsyntax_ext caused parse failures *within* a syntax extension to be fatal, which is probably not intended. Furthermore, this commit adds spans to diagnostics emitted by empty extensions if they were missing, à la rust-lang#56491.

make `panictry!` private to libsyntax This commit completely removes usage of the `panictry!` macro from outside libsyntax. The macro causes parse errors to be fatal, so using it in libsyntax_ext caused parse failures *within* a syntax extension to be fatal, which is probably not intended. Furthermore, this commit adds spans to diagnostics emitted by empty extensions if they were missing, à la #56491.

rust-highfive assigned aturon Dec 4, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 4, 2018

rust-highfive assigned estebank and unassigned aturon Dec 4, 2018

estebank reviewed Dec 4, 2018

View reviewed changes

Dylan-DPC-zz added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 4, 2018

emit error with span for empty asserts

a367cec

Fixes rust-lang#55547.

euclio force-pushed the assert-error branch from 01eaf4d to a367cec Compare December 4, 2018 15:23

estebank reviewed Dec 10, 2018

View reviewed changes

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 10, 2018

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 10, 2018

Rollup merge of rust-lang#56491 - euclio:assert-error, r=estebank

dec7b19

emit error with span for empty asserts Fixes rust-lang#55547.

GuillaumeGomez mentioned this pull request Dec 10, 2018

Rollup of 5 pull requests #56688

Merged

bors merged commit a367cec into rust-lang:master Dec 11, 2018

euclio deleted the assert-error branch December 11, 2018 00:24

euclio mentioned this pull request Dec 16, 2018

make panictry! private to libsyntax #56897

Merged

SimonSapin mentioned this pull request Dec 27, 2018

Call poly_project_and_unify_type on types that contain inference types #56838

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

emit error with span for empty asserts#56491