Edit error messages for `rustc_resolve::AmbiguityKind` variants #90075

pierwill · 2021-10-20T00:42:40Z

Edit the language of the ambiguity descriptions for E0659. These strings now appear as notes.

Closes #79717.

rust-highfive · 2021-10-20T00:42:43Z

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

camelid · 2021-10-20T00:59:10Z

@pierwill you need to bless tests :)

camelid · 2021-10-20T01:01:02Z

This new pattern should be easier for readers to follow. The parentheses answer the question "why is this ambiguous?" Answer: "[because of] conflicts with..."

We could consider going further: "foo is ambiguous due to conflicts with...". But maybe the current version you have balances concision and clarity better.

compiler/rustc_resolve/src/lib.rs

pierwill · 2021-10-20T01:04:43Z

I'll take another look at these, @camelid.

camelid · 2021-10-20T02:02:14Z

Stepping back a bit, I think it might be better if these notes were displayed as actual notes, rather than in parentheses in the main message. I'm not sure what others think, but do you want to try changing that and see how it looks?

Basically, I'm envisioning something like this:

error: `foo` is ambiguous
   --> $INFO
    |
$LL | $SRC_CODE
    |
    = note: ambiguous due to conflicts between ...

I think using a note would both be more consistent with other errors and make the error easier to read.

petrochenkov · 2021-10-20T09:15:03Z

r? @petrochenkov

compiler/rustc_resolve/src/diagnostics.rs

pierwill · 2021-10-20T16:30:23Z

Tests pass locally with err.note. 🎉

src/test/ui/rust-2018/uniform-paths/macro-rules.stderr

compiler/rustc_resolve/src/lib.rs

compiler/rustc_resolve/src/diagnostics.rs

camelid

I left a few comments on some changes that I felt could be made more informative. In general, some of the existing descriptions included "during import/macro resolution" or similar, which seems unhelpful and confusing. @petrochenkov i see you've assigned yourself on this PR; what do you think of removing the "during import/macro resolution" part?

compiler/rustc_resolve/src/lib.rs

petrochenkov · 2021-10-25T21:40:28Z

Sorry for more nitpicking, I just want to have comments from the previous round fully addressed (consistent wording and no /).

pierwill · 2021-10-25T22:15:26Z

Thank you, @petrochenkov!

camelid

r=petrochenkov,camelid with the below nits addressed and petrochenkov's approval. Thanks for making this change!

compiler/rustc_resolve/src/lib.rs

camelid · 2021-10-26T00:36:29Z

(Also, it looks like tests need to be blessed.)

Emit description of the ambiguity as a note. Co-authored-by: Noah Lev <camelidcamel@gmail.com> Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>

petrochenkov · 2021-10-26T07:57:43Z

@bors r+

bors · 2021-10-26T07:57:45Z

📌 Commit 7de1ff1 has been approved by petrochenkov

bors · 2021-10-26T07:57:54Z

⌛ Testing commit 7de1ff1 with merge c7a30c8...

bors · 2021-10-26T11:01:56Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing c7a30c8 to master...

rust-timer · 2021-10-26T12:33:27Z

Finished benchmarking commit (c7a30c8): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

rust-highfive assigned estebank Oct 20, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2021

camelid added the A-diagnostics Area: Messages for errors, warnings, and lints label Oct 20, 2021

camelid reviewed Oct 20, 2021

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

pierwill requested a review from camelid October 20, 2021 01:55

rust-highfive assigned petrochenkov and unassigned estebank Oct 20, 2021

pierwill force-pushed the fix-79717 branch from df145f6 to 65be45b Compare October 20, 2021 14:10

camelid reviewed Oct 20, 2021

View reviewed changes

compiler/rustc_resolve/src/diagnostics.rs Outdated Show resolved Hide resolved

pierwill requested a review from camelid October 20, 2021 16:29

camelid reviewed Oct 20, 2021

View reviewed changes

src/test/ui/rust-2018/uniform-paths/macro-rules.stderr Outdated Show resolved Hide resolved

camelid self-assigned this Oct 20, 2021

pierwill force-pushed the fix-79717 branch from ebe4e4d to 1a071df Compare October 20, 2021 17:32

camelid reviewed Oct 20, 2021

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

This comment has been minimized.

# to view

pierwill requested a review from camelid October 20, 2021 18:42

camelid reviewed Oct 20, 2021

View reviewed changes

compiler/rustc_resolve/src/diagnostics.rs Outdated Show resolved Hide resolved

pierwill requested a review from camelid October 21, 2021 01:15

This comment has been minimized.

# to view

pierwill force-pushed the fix-79717 branch 2 times, most recently from 27e9138 to 8b643a3 Compare October 24, 2021 18:15

camelid reviewed Oct 24, 2021

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

camelid added the A-resolve Area: Name/path resolution done by `rustc_resolve` specifically label Oct 24, 2021

This comment has been minimized.

# to view

pierwill force-pushed the fix-79717 branch from 21b7776 to 664c0e4 Compare October 25, 2021 20:21

This comment has been minimized.

# to view

pierwill force-pushed the fix-79717 branch from 664c0e4 to a055490 Compare October 25, 2021 20:48

pierwill requested review from petrochenkov and camelid October 25, 2021 21:07

pierwill force-pushed the fix-79717 branch from a055490 to 9685fbe Compare October 25, 2021 21:07

petrochenkov reviewed Oct 25, 2021

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

pierwill force-pushed the fix-79717 branch from 50123f7 to 6f24de6 Compare October 25, 2021 22:15

pierwill requested a review from petrochenkov October 25, 2021 22:16

This comment has been minimized.

# to view

camelid approved these changes Oct 25, 2021

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

pierwill force-pushed the fix-79717 branch from 6f24de6 to 7af5ca1 Compare October 26, 2021 01:22

Edit error messages for rustc_resolve::AmbiguityKind variants

7de1ff1

Emit description of the ambiguity as a note. Co-authored-by: Noah Lev <camelidcamel@gmail.com> Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>

pierwill force-pushed the fix-79717 branch from c029162 to 7de1ff1 Compare October 26, 2021 01:33

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 Oct 26, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2021

bors merged commit c7a30c8 into rust-lang:master Oct 26, 2021

rustbot added this to the 1.58.0 milestone Oct 26, 2021

pierwill deleted the fix-79717 branch October 26, 2021 14:54

ehuss mentioned this pull request Jun 28, 2022

Wrong span for E0277 error message "trait bound is not satisfied" #98645

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Edit error messages for `rustc_resolve::AmbiguityKind` variants #90075

Edit error messages for `rustc_resolve::AmbiguityKind` variants #90075

pierwill commented Oct 20, 2021 •

edited

Loading

rust-highfive commented Oct 20, 2021

camelid commented Oct 20, 2021

camelid commented Oct 20, 2021

pierwill commented Oct 20, 2021

camelid commented Oct 20, 2021 •

edited

Loading

petrochenkov commented Oct 20, 2021

pierwill commented Oct 20, 2021

This comment has been minimized.

This comment has been minimized.

camelid left a comment

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Oct 25, 2021

pierwill commented Oct 25, 2021

This comment has been minimized.

camelid left a comment

camelid commented Oct 26, 2021

petrochenkov commented Oct 26, 2021

bors commented Oct 26, 2021

bors commented Oct 26, 2021

bors commented Oct 26, 2021

rust-timer commented Oct 26, 2021

Edit error messages for rustc_resolve::AmbiguityKind variants #90075

Edit error messages for rustc_resolve::AmbiguityKind variants #90075

Conversation

pierwill commented Oct 20, 2021 • edited Loading

rust-highfive commented Oct 20, 2021

camelid commented Oct 20, 2021

camelid commented Oct 20, 2021

pierwill commented Oct 20, 2021

camelid commented Oct 20, 2021 • edited Loading

petrochenkov commented Oct 20, 2021

pierwill commented Oct 20, 2021

This comment has been minimized.

This comment has been minimized.

camelid left a comment

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Oct 25, 2021

pierwill commented Oct 25, 2021

This comment has been minimized.

camelid left a comment

Choose a reason for hiding this comment

camelid commented Oct 26, 2021

petrochenkov commented Oct 26, 2021

bors commented Oct 26, 2021

bors commented Oct 26, 2021

bors commented Oct 26, 2021

rust-timer commented Oct 26, 2021

Edit error messages for `rustc_resolve::AmbiguityKind` variants #90075

Edit error messages for `rustc_resolve::AmbiguityKind` variants #90075

pierwill commented Oct 20, 2021 •

edited

Loading

camelid commented Oct 20, 2021 •

edited

Loading