Point at local similarly named element and tweak references to variants #65421

estebank · 2019-10-15T00:21:20Z

Partially address #65386.

rust-highfive · 2019-10-15T00:21:23Z

r? @davidtwco

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

estebank · 2019-10-15T00:21:32Z

cc @petrochenkov @Centril

Centril · 2019-10-15T08:11:20Z

r? @petrochenkov (to make sure there's consensus due to #65386 (comment) and because Vadim knows resolve well ^^)

src/librustc/hir/def.rs

src/librustc_resolve/diagnostics.rs

src/librustc_resolve/late/diagnostics.rs

estebank · 2019-10-16T19:54:30Z

src/test/ui/derives/deriving-meta-unknown-trait.stderr

+  ::: $SRC_DIR/libcore/cmp.rs:LL:COL
+   |
+LL | pub macro Eq($item:item) { /* compiler built-in */ }
+   | ---------------------------------------------------- similarly named derive macro `Eq` defined here


It seems to me that for some proc and derive macros the new output might be more confusing than helpful for new comers ("how do I do that"), but at the same time they'd be nice to have as well for everyone else.

src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr

estebank · 2019-10-16T19:57:43Z

src/test/ui/proc-macro/parent-source-spans.stderr

+  ::: $SRC_DIR/libcore/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     --------------------------------------------------- similarly named tuple variant `Ok` defined here


Somewhat unexpectedly (but not unforeseeably), this change now makes more obvious that attribute annotations are part of the public documentation and will be more visible than currently. In some cases like this one it might make sense to tweak them "out of the way" to improve readability while keeping the same semantic meaning.

estebank · 2019-10-16T20:05:38Z

Current output for the original report being addressed:

src/librustc_resolve/diagnostics.rs

src/librustc_resolve/late.rs

petrochenkov · 2019-10-18T21:49:24Z

We cannot land this with disabled tests.
If the tests failed on x86 linux, then it's very likely that the they will fail on some targets on CI, and then on other targets that people use but which are not on CI.

The change causing non-reproducible output needs to be either removed or investigated/fixed to remove the source of non-reproducibility.

Beside that the PR looks good.

Point at the span for the definition of ADTs internal to the current crate. Look at the leading char of the ident to determine whether we're expecting a likely fn or any of a fn, a tuple struct or a tuple variant. Turn fn `add_typo_suggestion` into a `Resolver` method.

estebank · 2019-10-27T19:29:53Z

@bors r=petrochenkov

bors · 2019-10-27T19:29:54Z

📌 Commit b26ddb8 has been approved by petrochenkov

Point at local similarly named element and tweak references to variants Partially address rust-lang#65386.

bors · 2019-10-28T13:41:19Z

⌛ Testing commit b26ddb8 with merge 8d78bf6...

Point at local similarly named element and tweak references to variants Partially address #65386.

bors · 2019-10-28T17:17:24Z

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing 8d78bf6 to master...

rust-highfive · 2019-10-28T17:18:48Z

📣 Toolstate changed by #65421!

Tested on commit 8d78bf6.
Direct link to PR: #65421

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

@Xanewok

Tested on commit rust-lang/rust@8d78bf6. Direct link to PR: <rust-lang/rust#65421> 💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra). 💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

Point at the span for the definition of crate foreign ADTs Follow up to #65421. Partially addresses #65386. Blocked on #53081.

rust-highfive assigned davidtwco Oct 15, 2019

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

This comment has been minimized.

Sign in to view

rust-highfive assigned petrochenkov and unassigned davidtwco Oct 15, 2019

petrochenkov reviewed Oct 15, 2019

View reviewed changes

src/librustc/hir/def.rs Outdated Show resolved Hide resolved

src/librustc_resolve/diagnostics.rs Outdated Show resolved Hide resolved

src/librustc_resolve/late/diagnostics.rs Outdated Show resolved Hide resolved

petrochenkov 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 Oct 15, 2019

estebank force-pushed the variants branch from d58210c to 492dc22 Compare October 16, 2019 19:52

estebank commented Oct 16, 2019

View reviewed changes

src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr Show resolved Hide resolved

estebank commented Oct 16, 2019

View reviewed changes

estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 16, 2019

This comment has been minimized.

Sign in to view

estebank force-pushed the variants branch from 492dc22 to 231ea27 Compare October 16, 2019 21:18

This comment has been minimized.

Sign in to view

petrochenkov reviewed Oct 17, 2019

View reviewed changes

src/librustc_resolve/diagnostics.rs Outdated Show resolved Hide resolved

src/librustc_resolve/diagnostics.rs Outdated Show resolved Hide resolved

src/librustc_resolve/late.rs Outdated Show resolved Hide resolved

petrochenkov 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 Oct 17, 2019

estebank mentioned this pull request Oct 17, 2019

Reduce the places where stable annotations are needed #65515

Open

estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 17, 2019

estebank force-pushed the variants branch from ff614ec to 96b83b9 Compare October 17, 2019 23:48

petrochenkov 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 Oct 27, 2019

estebank force-pushed the variants branch from ee6b92e to b26ddb8 Compare October 27, 2019 18:51

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

Centril added a commit to Centril/rust that referenced this pull request Oct 27, 2019

Rollup merge of rust-lang#65421 - estebank:variants, r=petrochenkov

af6b43a

Point at local similarly named element and tweak references to variants Partially address rust-lang#65386.

Centril mentioned this pull request Oct 27, 2019

Rollup of 7 pull requests #65878

Closed

bors added a commit that referenced this pull request Oct 28, 2019

Auto merge of #65421 - estebank:variants, r=petrochenkov

8d78bf6

Point at local similarly named element and tweak references to variants Partially address #65386.

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 28, 2019

bors merged commit b26ddb8 into rust-lang:master Oct 28, 2019

This was referenced Oct 28, 2019

Improve the "try using a variant of the expected type" hint. #65562

Merged

Rollup of 7 pull requests #65896

Closed

estebank mentioned this pull request Oct 28, 2019

Point at the span for the definition of crate foreign ADTs #65912

Merged

ultrasaurus mentioned this pull request Oct 29, 2019

tuple variant error message is confusing #65386

Closed

9 tasks

Mark-Simulacrum mentioned this pull request Nov 2, 2019

Compile hangs endlessly in LLVM in await-heavy code when ThinLTO is enabled #66036

Closed

bors added a commit that referenced this pull request Jan 11, 2020

Auto merge of #65912 - estebank:variants-orig, r=petrochenkov

543b7d9

Point at the span for the definition of crate foreign ADTs Follow up to #65421. Partially addresses #65386. Blocked on #53081.

dtolnay mentioned this pull request May 24, 2020

Suggested spelling correction seems off-base #72553

Closed

estebank deleted the variants branch November 9, 2023 05:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Point at local similarly named element and tweak references to variants #65421

Point at local similarly named element and tweak references to variants #65421

estebank commented Oct 15, 2019

rust-highfive commented Oct 15, 2019

estebank commented Oct 15, 2019

This comment has been minimized.

This comment has been minimized.

Centril commented Oct 15, 2019 •

edited

Loading

estebank Oct 16, 2019

estebank Oct 16, 2019

estebank commented Oct 16, 2019 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Oct 18, 2019

estebank commented Oct 27, 2019

bors commented Oct 27, 2019

bors commented Oct 28, 2019

bors commented Oct 28, 2019

rust-highfive commented Oct 28, 2019

Point at local similarly named element and tweak references to variants #65421

Point at local similarly named element and tweak references to variants #65421

Conversation

estebank commented Oct 15, 2019

rust-highfive commented Oct 15, 2019

estebank commented Oct 15, 2019

This comment has been minimized.

This comment has been minimized.

Centril commented Oct 15, 2019 • edited Loading

estebank Oct 16, 2019

Choose a reason for hiding this comment

estebank Oct 16, 2019

Choose a reason for hiding this comment

estebank commented Oct 16, 2019 • edited Loading

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Oct 18, 2019

estebank commented Oct 27, 2019

bors commented Oct 27, 2019

bors commented Oct 28, 2019

bors commented Oct 28, 2019

rust-highfive commented Oct 28, 2019

Centril commented Oct 15, 2019 •

edited

Loading

estebank commented Oct 16, 2019 •

edited

Loading