Skip to content

Accurately portray raw identifiers in error messages #67010

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 3 commits into from
Dec 6, 2019
Merged

Accurately portray raw identifiers in error messages #67010

merged 3 commits into from
Dec 6, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Dec 4, 2019

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

Fix #65634.

@estebank
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
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 4, 2019
Centril
Centril reviewed Dec 4, 2019
View reviewed changes
@Centril
Copy link
Contributor

Centril commented Dec 4, 2019 •
edited
Loading

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

@Centril Centril assigned Centril and unassigned nikomatsakis Dec 4, 2019
@Centril 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
@rust-highfive

This comment has been minimized.

# to view
@estebank
Copy link
Contributor Author

estebank commented Dec 4, 2019

@bors r=Centril rollup

@bors
Copy link
Collaborator

bors commented Dec 4, 2019

📌 Commit 0103308 has been approved by Centril

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 4, 2019
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Dec 5, 2019
@JohnTitor
Rollup merge of rust-lang#67010 - estebank:raw-idents, r=Centril
89931eb 
Accurately portray raw identifiers in error messages

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

Fix rust-lang#65634.
@JohnTitor JohnTitor mentioned this pull request Dec 5, 2019
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Dec 5, 2019
@JohnTitor
Rollup merge of rust-lang#67010 - estebank:raw-idents, r=Centril
2750309 
Accurately portray raw identifiers in error messages

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

Fix rust-lang#65634.
@JohnTitor JohnTitor mentioned this pull request Dec 5, 2019
Closed
RalfJung added a commit to RalfJung/rust that referenced this pull request Dec 5, 2019
@RalfJung
Rollup merge of rust-lang#67010 - estebank:raw-idents, r=Centril
36a1303 
Accurately portray raw identifiers in error messages

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

Fix rust-lang#65634.
@RalfJung RalfJung mentioned this pull request Dec 5, 2019
Closed
bors added a commit that referenced this pull request Dec 5, 2019
@bors
Auto merge of #67048 - RalfJung:rollup-drjnmt0, r=RalfJung
18a1891 
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
Centril added a commit to Centril/rust that referenced this pull request Dec 5, 2019
@Centril
Rollup merge of rust-lang#67010 - estebank:raw-idents, r=Centril
8e6cf86 
Accurately portray raw identifiers in error messages

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

Fix rust-lang#65634.
@Centril Centril mentioned this pull request Dec 5, 2019
Merged
bors added a commit that referenced this pull request Dec 5, 2019
@bors
Auto merge of #67060 - Centril:rollup-hwhdx4h, r=Centril
f6840f3 
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
@bors bors merged commit 0103308 into rust-lang:master Dec 6, 2019
olegnn
olegnn reviewed Dec 6, 2019
View reviewed changes
Copy link
Contributor

@olegnn olegnn left a comment

Choose a reason for hiding this comment

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

Some hints with raw identifiers are still incorrect.

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
Copy link
Contributor

Choose a reason for hiding this comment

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

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

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`
Copy link
Contributor

Choose a reason for hiding this comment

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

r#async

olegnn
olegnn reviewed Dec 6, 2019
View reviewed changes
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
Copy link
Contributor

Choose a reason for hiding this comment

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

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

@estebank
Copy link
Contributor Author

estebank commented Dec 6, 2019

@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
Copy link
Contributor

olegnn commented Dec 6, 2019

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
Copy link
Contributor Author

estebank commented Dec 6, 2019

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

@petrochenkov petrochenkov mentioned this pull request Feb 22, 2020
Merged
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 25, 2020
@Dylan-DPC
Rollup merge of rust-lang#69387 - petrochenkov:idprint, r=Mark-Simula…
9e487c8 
…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
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 26, 2020
@Dylan-DPC
Rollup merge of rust-lang#69387 - petrochenkov:idprint, r=Mark-Simula…
41bf200 
…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
@estebank estebank deleted the raw-idents branch November 9, 2023 05:17
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@Centril Centril Centril left review comments

@olegnn olegnn olegnn left review comments

Assignees

@Centril Centril

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Incorrect compiler hints for traits with methods defined using raw identifiers
6 participants
@estebank @rust-highfive @Centril @bors @olegnn @nikomatsakis