Include rmeta candidates in "multiple matching crates" error by camelid · Pull Request #89587 · rust-lang/rust

camelid · 2021-10-06T02:51:16Z

Only dylib and rlib candidates were included in the error. I think the
reason is that at the time this error was originally implemented, rmeta
crate sources were represented different from dylib and rlib sources.
I wrote up more detailed analysis in this comment.

The new version of the code is also a bit easier to read and should be
more robust to future changes since it uses CrateSources::paths().

I also changed the code to sort the candidates to make the output deterministic;
added full stderr tests for the error; and added a long error code explanation.

cc @Mark-Simulacrum @jyn514

rust-highfive · 2021-10-06T02:51:18Z

r? @oli-obk

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

camelid · 2021-10-06T03:15:05Z

This padding doesn't seem correct to me. It's the same as before, but crate ` is 7 chars and `: is 3 chars (backtick, colon, space). Together, that makes 10 characters, not 8. Additionally, I don't think the format specifier {:>padding$} is correct for paths shorter than padding.
Should I change it to push_str the padding, and then push the path, rather than using format specifiers? I think that would be more correct.

camelid · 2021-10-06T16:58:00Z

Looks like tests failed for two reasons: (1) #89587 (comment) and (2) inconsistent ordering of candidates. For (1), I just need to add normalize-stderr-test. For (2), I'm thinking I could just sort the candidate paths. Would that be reasonable?

camelid · 2021-10-06T17:06:20Z

(1) should be fixed now.

camelid · 2021-10-06T17:45:08Z

Ok, (2) should be fixed as well now.

camelid · 2021-10-06T17:46:03Z

I also reordered the commits so that the tests are added before the rmeta candidates fix so you can see the diff.

camelid · 2021-10-11T17:43:02Z

@bors r=petrochenkov

bors · 2021-10-11T17:43:04Z

📌 Commit 359a3fdfc2d7f425c29155959643f7a5d46d732e has been approved by petrochenkov

bors · 2021-10-11T20:20:42Z

⌛ Testing commit 359a3fdfc2d7f425c29155959643f7a5d46d732e with merge 9abf6d9699ae26eec2c5a48bc6e610f6f97cc410...

petrochenkov · 2021-10-11T20:20:41Z

Why doesn't this issue appear with other tests printing $TEST_BUILD_DIR paths?
Do verbatim paths (\\?) appear because the path is fs::canonicalize-d in this case?
This normalization looks like a compiletest's job (src\tools\compiletest\src\runtest.rs -> fn normalize_output).

I agree that it's a bit odd, but I figured it's because the crate loader is showing absolute paths. I don't have time to look into whether this is a compiletest issue unfortunately.

This makes the error output deterministic and thus testable.

And remove E0464 from test-exemption list, since it now has a full test.

Only dylib and rlib candidates were included in the error. I think the reason is that at the time this error was originally implemented, rmeta crate sources were represented different from dylib and rlib sources. I wrote up more detailed analysis in [this comment][1]. The new version of the code is also a bit easier to read and should be more robust to future changes since it uses `CrateSources::paths()`. [1]: rust-lang#88675 (comment)

The test is copied from `src/test/ui/crate-loading/crateresolve1.rs` and its auxiliary tests. I added it to the `compile_fail` code example check exemption list since it's hard if not impossible to reproduce this error in a standalone code example.

camelid · 2021-10-12T20:32:37Z

@bors r=petrochenkov

bors · 2021-10-12T20:32:38Z

📌 Commit bf2d2e5 has been approved by petrochenkov

bors · 2021-10-13T10:38:16Z

⌛ Testing commit bf2d2e5 with merge 5728bd6...

bors · 2021-10-13T13:41:43Z

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

rust-timer · 2021-10-13T17:25:41Z

Finished benchmarking commit (5728bd6): 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

camelid added A-diagnostics Area: Messages for errors, warnings, and lints A-metadata Area: Crate metadata labels Oct 6, 2021

rust-highfive assigned oli-obk Oct 6, 2021

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

camelid force-pushed the all-candidates branch from 51fb513 to 97a8e59Compare October 6, 2021 02:53

camelid mentioned this pull request Oct 6, 2021
Only check the compiler and standard library before documenting them #88675
Closed

This comment has been minimized.
Sign in to view

camelid force-pushed the all-candidates branch from 97a8e59 to 63efeabCompare October 6, 2021 03:11

camelid commented Oct 6, 2021
View reviewed changes

Comment threadsrc/test/ui/crate-loading/crateresolve1.stderr Outdated

This comment has been minimized.
Sign in to view

petrochenkov self-assigned this Oct 6, 2021

oli-obk removed their assignment Oct 6, 2021

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 6, 2021

camelid force-pushed the all-candidates branch from 9ace45d to 78b352eCompare October 6, 2021 16:18

camelid 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 6, 2021

This comment has been minimized.
Sign in to view

camelid force-pushed the all-candidates branch from 78b352e to c578e27Compare October 6, 2021 17:03

camelid force-pushed the all-candidates branch from c578e27 to 8a5e22eCompare October 6, 2021 17:11

This comment has been minimized.
Sign in to view

camelid force-pushed the all-candidates branch from 8a5e22e to 79b3ef8Compare October 6, 2021 17:45

camelid commented Oct 6, 2021
View reviewed changes

Comment threadcompiler/rustc_metadata/src/locator.rs

camelid mentioned this pull request Oct 6, 2021
Add missing long error code explanations #61137
Closed
100 tasks

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 11, 2021

petrochenkov reviewed Oct 11, 2021
View reviewed changes

This comment has been minimized.
Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 11, 2021

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 11, 2021

This comment has been minimized.
Sign in to view

camelid added 5 commits October 12, 2021 13:08

Sort candidate libraries by source path in error
6792c6a
This makes the error output deterministic and thus testable.

Test crate loading error stderr
642a43a
And remove E0464 from test-exemption list, since it now has a full test.

Add test for showing rmeta candidates in error
ad49cb6

Add long explanation for E0464
cc6a090
The test is copied from `src/test/ui/crate-loading/crateresolve1.rs` and its auxiliary tests. I added it to the `compile_fail` code example check exemption list since it's hard if not impossible to reproduce this error in a standalone code example.

camelid force-pushed the all-candidates branch from 359a3fd to cc6a090Compare October 12, 2021 20:11

Work around different filenames for DLLs
bf2d2e5

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 12, 2021

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

bors merged commit 5728bd6 into rust-lang:masterOct 13, 2021

pnkfelix mentioned this pull request Dec 8, 2021
doc test "Couldn't compile the test" on aarch64 + LTO #91671
Closed

Uh oh!

Uh oh!

Conversation

camelid commented Oct 6, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Oct 6, 2021

Uh oh!

This comment has been minimized.

Uh oh!

camelidOct 6, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

camelid commented Oct 6, 2021

Uh oh!

camelid commented Oct 6, 2021

Uh oh!

This comment has been minimized.

camelid commented Oct 6, 2021

Uh oh!

camelid commented Oct 6, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

camelid commented Oct 11, 2021

Uh oh!

bors commented Oct 11, 2021

Uh oh!

bors commented Oct 11, 2021

Uh oh!

petrochenkovOct 11, 2021

Choose a reason for hiding this comment

Uh oh!

camelidOct 11, 2021

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

camelid commented Oct 12, 2021

Uh oh!

bors commented Oct 12, 2021

Uh oh!

bors commented Oct 13, 2021

Uh oh!

bors commented Oct 13, 2021

Uh oh!

rust-timer commented Oct 13, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

camelid commented Oct 6, 2021•
edited
Loading

camelid commented Oct 6, 2021•
edited
Loading