Accurately portray raw identifiers in error messages #67010

estebank · 2019-12-04T03:05:03Z

When refering to or suggesting raw identifiers, refer to them with r#.

Fix #65634.

When refering to or suggesting raw identifiers, refer to them with `r#`. Fix rust-lang#65634.

rust-highfive · 2019-12-04T03:05:14Z

r? @nikomatsakis

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

src/test/ui/raw-ident-suggestion.rs

Centril · 2019-12-04T03:12:36Z

r? @Centril r=me rollup with ^-- fixed.

estebank · 2019-12-04T15:38:40Z

@bors r=Centril rollup

bors · 2019-12-04T15:38:41Z

📌 Commit 0103308 has been approved by Centril

Accurately portray raw identifiers in error messages When refering to or suggesting raw identifiers, refer to them with `r#`. Fix rust-lang#65634.

@ghost

Rollup of 13 pull requests Successful merges: - #66405 (Tweak `ObligationForest` `NodeState`s) - #66730 (remove dependency from libhermit) - #66764 (Tweak wording of `collect()` on bad target type) - #66899 (Standard library support for riscv64gc-unknown-linux-gnu) - #66900 (Clean up error codes) - #66974 ([CI] fix the `! isCI` check in src/ci/run.sh) - #66979 (Add long error for E0631 and update ui tests.) - #67005 (capitalize Rust) - #67010 (Accurately portray raw identifiers in error messages) - #67011 (Include a span in more `expected...found` notes) - #67017 (cleanup long error explanations) - #67021 (Fix docs for formatting delegations) - #67041 (add ExitStatusExt into prelude) Failed merges: r? @ghost

Accurately portray raw identifiers in error messages When refering to or suggesting raw identifiers, refer to them with `r#`. Fix rust-lang#65634.

@ghost

Rollup of 9 pull requests Successful merges: - #66710 (weak-into-raw: Clarify some details in Safety) - #66863 (Check break target availability when checking breaks with values) - #67002 (Fix documentation of pattern for str::matches()) - #67005 (capitalize Rust) - #67010 (Accurately portray raw identifiers in error messages) - #67011 (Include a span in more `expected...found` notes) - #67044 (E0023: handle expected != tuple pattern type) - #67045 (rustc_parser: cleanup imports) - #67055 (Make const-qualification look at more `const fn`s) Failed merges: r? @ghost

olegnn

Some hints with raw identifiers are still incorrect.

olegnn · 2019-12-06T11:37:34Z

src/test/ui/issues/issue-65634-raw-ident-suggestion.stderr

+   |
+LL |     fn r#struct(&self) {
+   |     ^^^^^^^^^^^^^^^^^^
+   = help: to disambiguate the method call, write `async::r#struct(r#fn {})` instead


I think this should be r#async::r#struct(r#fn {}) instead of async::r#struct(r#fn {})

olegnn · 2019-12-06T11:38:55Z

src/test/ui/issues/issue-65634-raw-ident-suggestion.stderr

+LL |     r#fn {}.r#struct();
+   |             ^^^^^^^^ multiple `r#struct` found
+   |
+note: candidate #1 is defined in an impl of the trait `async` for the type `r#fn`


olegnn · 2019-12-06T11:41:02Z

src/test/ui/issues/issue-65634-raw-ident-suggestion.stderr

+   |
+LL |     fn r#struct(&self) {
+   |     ^^^^^^^^^^^^^^^^^^
+   = help: to disambiguate the method call, write `await::r#struct(r#fn {})` instead


r#await::r#struct(r#fn {})

estebank · 2019-12-06T16:27:36Z

@olegnn it isn't clear from the test (but tested locally, just forgot to add the test file) that this is because the test is running as edition 2015, where await is not a keyword, so this is correct. If the test had a header with // edition:2018 the output would match what you expect.

olegnn · 2019-12-06T17:22:58Z

Sorry, I didn't notice that it's edition 2015. But anyway, if item is declared with r# prefix, shouldn't it be mentioned the same way?

estebank · 2019-12-06T17:26:28Z

We don't keep track of whether an identifier was raw or not, we currently infer it from the fact that they couldn't be written any other way (if we have a struct called struct, it could only be a raw ident). I think this is fine, we only want to make people aware of raw idents if there's no other option. Only people writing ffi or macros should even need to care about these :)

@Mark-Simulacrum

…crum Deduplicate identifier printing a bit rust-lang#67010 introduced a couple more subtly different ways to print an identifier. This PR attempts to restore the order. The most basic identifier printing interface is `Formatter`-based now, so `String`s are not allocated unless required. r? @Mark-Simulacrum

@Mark-Simulacrum

…crum Deduplicate identifier printing a bit rust-lang#67010 introduced a couple more subtly different ways to print an identifier. This PR attempts to restore the order. The most basic identifier printing interface is `Formatter`-based now, so `String`s are not allocated unless required. r? @Mark-Simulacrum

Accurately portray raw identifiers in error messages

f6b435d

When refering to or suggesting raw identifiers, refer to them with `r#`. Fix rust-lang#65634.

rust-highfive assigned nikomatsakis Dec 4, 2019

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

Centril reviewed Dec 4, 2019

View reviewed changes

src/test/ui/raw-ident-suggestion.rs Outdated Show resolved Hide resolved

Centril assigned Centril and unassigned nikomatsakis Dec 4, 2019

Centril 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, 2019

This comment has been minimized.

Sign in to view

estebank added 2 commits December 3, 2019 22:25

review comments: move test

b5ad0cb

Account for raw idents in module file finding

0103308

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 4, 2019

JohnTitor mentioned this pull request Dec 5, 2019

Rollup of 13 pull requests #67042

Closed

JohnTitor mentioned this pull request Dec 5, 2019

Rollup of 13 pull requests #67043

Closed

RalfJung mentioned this pull request Dec 5, 2019

Rollup of 13 pull requests #67048

Closed

Centril mentioned this pull request Dec 5, 2019

Rollup of 9 pull requests #67060

Merged

bors merged commit 0103308 into rust-lang:master Dec 6, 2019

olegnn reviewed Dec 6, 2019

View reviewed changes

petrochenkov mentioned this pull request Feb 22, 2020

Deduplicate identifier printing a bit #69387

Merged

estebank deleted the raw-idents branch November 9, 2023 05:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Accurately portray raw identifiers in error messages #67010

Accurately portray raw identifiers in error messages #67010

estebank commented Dec 4, 2019

rust-highfive commented Dec 4, 2019

Centril commented Dec 4, 2019 •

edited

Loading

This comment has been minimized.

estebank commented Dec 4, 2019

bors commented Dec 4, 2019

olegnn left a comment

olegnn Dec 6, 2019

olegnn Dec 6, 2019

olegnn Dec 6, 2019

estebank commented Dec 6, 2019

olegnn commented Dec 6, 2019

estebank commented Dec 6, 2019

Accurately portray raw identifiers in error messages #67010

Accurately portray raw identifiers in error messages #67010

Conversation

estebank commented Dec 4, 2019

rust-highfive commented Dec 4, 2019

Centril commented Dec 4, 2019 • edited Loading

This comment has been minimized.

estebank commented Dec 4, 2019

bors commented Dec 4, 2019

olegnn left a comment

Choose a reason for hiding this comment

olegnn Dec 6, 2019

Choose a reason for hiding this comment

olegnn Dec 6, 2019

Choose a reason for hiding this comment

olegnn Dec 6, 2019

Choose a reason for hiding this comment

estebank commented Dec 6, 2019

olegnn commented Dec 6, 2019

estebank commented Dec 6, 2019

Centril commented Dec 4, 2019 •

edited

Loading