rustc: Use `tcx.used_crates(())` more #124976

petrochenkov · 2024-05-10T15:03:24Z

And explain when it should be used.

Addresses comments from #121167.

rustbot · 2024-05-10T15:03:32Z

rustbot has assigned @compiler-errors.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-05-10T15:03:34Z

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

RalfJung · 2024-05-10T15:11:31Z

compiler/rustc_middle/src/query/mod.rs

-    // FIXME: This is currently only used for collecting lang items, but should be used instead of
-    // `crates` in most other cases too.
+    // Should be used to maintain observable language behavior, for example when collecting lang
+    // items or impls from all crates, or collecting libraries to link.
    query used_crates(_: ()) -> &'tcx [CrateNum] {


"used" kind of sounds like if I add a crate as a dependency but don't use it, it doesn't show up.

Maybe required_crates?

Also all_crates could maybe need a more scary name, like crates_including_speculative or so?

crates_including_speculative looks fine to me.
Not sure about required_crates.

Ideally I'd turn the used bool in crate loader into a 3-variant enum:

enum WhatCrateIsLoadedFor { ForRealThings, // Need to be encoded into metadata in any case ForDocLinksAndDiagnosticsOnly, // It may be possible to drop these ones from metadata, if we clean their traces from source map somehow ForDiagnosticsOnly, }

Maybe even merge it with existing enum CrateDepKind which is sort of similar.

Let's keep its pre-existing naming for now.

compiler/rustc_middle/src/query/mod.rs

src/tools/miri/src/helpers.rs

compiler-errors · 2024-05-22T14:50:18Z

@rustbot author

And explain when it should be used.

oli-obk · 2024-05-22T15:06:16Z

@bors try @rust-timer queue

bors · 2024-05-22T15:07:31Z

⌛ Trying commit 0f35ba8 with merge 0cba80b...

rustc: Use `tcx.used_crates(())` more And explain when it should be used. Addresses comments from rust-lang#121167.

petrochenkov · 2024-05-22T15:09:18Z

I was just going to push an updated version.
@bors r-
Not sure if it's possible to cancel bors try.

compiler-errors · 2024-05-22T15:10:15Z

If you push, then it'll cancel the try.

petrochenkov · 2024-05-22T15:10:58Z

Also, in practice speculative crates are not common, so I don't expect much difference in perf.

petrochenkov · 2024-05-22T15:53:29Z

@bors try @rust-timer queue

bors · 2024-05-22T15:54:39Z

⌛ Trying commit 711338b with merge 20a9c4a...

rustc: Use `tcx.used_crates(())` more And explain when it should be used. Addresses comments from rust-lang#121167.

oli-obk · 2024-05-23T08:34:26Z

r? @oli-obk

@bors r+

bors · 2024-05-23T08:34:28Z

📌 Commit 711338b has been approved by oli-obk

It is now in the queue for this repository.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#124297 (Allow coercing functions whose signature differs in opaque types in their defining scope into a shared function pointer type) - rust-lang#124516 (Allow monomorphization time const eval failures if the cause is a type layout issue) - rust-lang#124976 (rustc: Use `tcx.used_crates(())` more) - rust-lang#125210 (Cleanup: Fix up some diagnostics) - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`) - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`) - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format) - rust-lang#125438 (Remove unneeded string conversion) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#124976 - petrochenkov:usedcrates, r=oli-obk rustc: Use `tcx.used_crates(())` more And explain when it should be used. Addresses comments from rust-lang#121167.

lqd · 2024-05-24T11:39:49Z

tests/ui/extern-flag/empty-extern-arg.stderr

 error: requires `sized` lang_item

-error: aborting due to 4 previous errors
+error: aborting due to 2 previous errors


Was this diagnostics change expected? (I'm analyzing the regressions caused by this PR)

Yes, during my review I assumed this is the weak lang item check that now only looks at crates that are actually used, so we aren't speculatively looking at weak lang items of unused crates anymore

From what I see libcore is loaded speculatively in this test (missing_core in fn resolve_crate) and this error happens due to (weak) lang items in core.

> Please ensure your PR description includes the following: > 1. A description of how your changes improve Kani. > 2. Some context on the problem you are solving. > 3. A list of issues that are resolved by this PR. > 4. If you had to perform any manual test, please describe them. > > **Make sure you remove this list from the final PR description.** Fix usage of `tcx.crates()`: rust-lang/rust#124976. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

lqd · 2024-06-05T12:30:39Z

beta branches in a couple days, and so maybe we should revert this PR before then

petrochenkov · 2024-06-05T12:42:58Z

I assumed #125493 had already been merged.

…=oli-obk" This reverts commit eda4a35, reversing changes made to eb6b35b.

Revert "use `tcx.used_crates(())` more" before it reaches beta There are more open issues caused by rust-lang#124976 than will be fixed by rust-lang#125493 alone. The beta cut is soon, so let's revert it and buy some time to analyze and fix these issues in our own time. fixes rust-lang#125474 fixes rust-lang#125484 fixes rust-lang#125646 fixes rust-lang#125707 fixes rust-lang#126066 fixes rust-lang#125934 fixes rust-lang#126021 r? `@petrochenkov` `@bors` p=1

Revert "use `tcx.used_crates(())` more" before it reaches beta There are more open issues caused by rust-lang#124976 than will be fixed by rust-lang#125493 alone. The beta cut is soon, so let's revert it and buy some time to analyze and fix these issues in our own time. fixes rust-lang#125474 fixes rust-lang#125484 fixes rust-lang#125646 fixes rust-lang#125707 fixes rust-lang#126066 fixes rust-lang#125934 fixes rust-lang#126021 r? ``@petrochenkov`` ``@bors`` p=1

Revert "use `tcx.used_crates(())` more" before it reaches beta There are more open issues caused by rust-lang#124976 than will be fixed by rust-lang#125493 alone. The beta cut is soon, so let's revert it and buy some time to analyze and fix these issues in our own time. fixes rust-lang#125474 fixes rust-lang#125484 fixes rust-lang#125646 fixes rust-lang#125707 fixes rust-lang#126066 fixes rust-lang#125934 fixes rust-lang#126021 r? `@petrochenkov` `@bors` p=1

…=oli-obk" This reverts commit eda4a35, reversing changes made to eb6b35b.

Revert "use `tcx.used_crates(())` more" before it reaches beta There are more open issues caused by rust-lang#124976 than will be fixed by rust-lang#125493 alone. The beta cut is soon, so let's revert it and buy some time to analyze and fix these issues in our own time. fixes rust-lang#125474 fixes rust-lang#125484 fixes rust-lang#125646 fixes rust-lang#125707 fixes rust-lang#126066 fixes rust-lang#125934 fixes rust-lang#126021 r? `@petrochenkov` `@bors` p=1

rustbot assigned compiler-errors May 10, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 10, 2024

petrochenkov force-pushed the usedcrates branch from 17ca22b to 0f35ba8 Compare May 10, 2024 15:06

RalfJung reviewed May 10, 2024

View reviewed changes

compiler/rustc_middle/src/query/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed May 10, 2024

View reviewed changes

src/tools/miri/src/helpers.rs Outdated Show resolved Hide resolved

rustbot 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 May 22, 2024

rustc: Use tcx.used_crates(()) more

711338b

And explain when it should be used.

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 22, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2024

Auto merge of rust-lang#124976 - petrochenkov:usedcrates, r=<try>

0cba80b

rustc: Use `tcx.used_crates(())` more And explain when it should be used. Addresses comments from rust-lang#121167.

petrochenkov closed this May 22, 2024

petrochenkov reopened this May 22, 2024

petrochenkov force-pushed the usedcrates branch from 0f35ba8 to 711338b Compare May 22, 2024 15:52

This comment has been minimized.

Sign in to view

petrochenkov removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 22, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2024

Auto merge of rust-lang#124976 - petrochenkov:usedcrates, r=<try>

20a9c4a

rustc: Use `tcx.used_crates(())` more And explain when it should be used. Addresses comments from rust-lang#121167.

rustbot assigned oli-obk and unassigned compiler-errors May 23, 2024

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-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2024

matthiaskrgr mentioned this pull request May 23, 2024

Rollup of 8 pull requests #125448

Merged

bors merged commit eda4a35 into rust-lang:master May 23, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone May 23, 2024

This was referenced May 24, 2024

ICE: index out of bounds in rustc_codegen_ssa #125474

Closed

ICE when using Instant type with the time crate. #125484

Closed

lqd reviewed May 24, 2024

View reviewed changes

lqd mentioned this pull request May 24, 2024

only return used dependencies in crate_dependencies_in_postorder #125493

Closed

qinheping mentioned this pull request May 30, 2024

Update Rust toolchain nightly-2024-05-24 model-checking/kani#3212

Merged

lqd mentioned this pull request Jun 3, 2024

rustc 1.80.0-nightly crash #125934

Closed

lqd added a commit to lqd/rust that referenced this pull request Jun 6, 2024

Revert "Rollup merge of rust-lang#124976 - petrochenkov:usedcrates, r…

e21a383

…=oli-obk" This reverts commit eda4a35, reversing changes made to eb6b35b.

lqd mentioned this pull request Jun 6, 2024

Revert "use tcx.used_crates(()) more" before it reaches beta #126068

Merged

lqd added a commit to lqd/rust that referenced this pull request Jun 6, 2024

Revert "Rollup merge of rust-lang#124976 - petrochenkov:usedcrates, r…

0a4176a

…=oli-obk" This reverts commit eda4a35, reversing changes made to eb6b35b.

Oneirical pushed a commit to Oneirical/rust that referenced this pull request Jun 9, 2024

Revert "Rollup merge of rust-lang#124976 - petrochenkov:usedcrates, r…

4111a43

…=oli-obk" This reverts commit eda4a35, reversing changes made to eb6b35b.

lcnr pushed a commit to lcnr/rust that referenced this pull request Jun 12, 2024

Revert "Rollup merge of rust-lang#124976 - petrochenkov:usedcrates, r…

adcf228

…=oli-obk" This reverts commit eda4a35, reversing changes made to eb6b35b.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 13, 2024

Revert "Rollup merge of rust-lang#124976 - petrochenkov:usedcrates, r…

c245cde

…=oli-obk" This reverts commit eda4a35, reversing changes made to eb6b35b.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustc: Use `tcx.used_crates(())` more #124976

rustc: Use `tcx.used_crates(())` more #124976

petrochenkov commented May 10, 2024

rustbot commented May 10, 2024

rustbot commented May 10, 2024

RalfJung May 10, 2024

petrochenkov May 22, 2024

compiler-errors commented May 22, 2024

oli-obk commented May 22, 2024

This comment has been minimized.

bors commented May 22, 2024

petrochenkov commented May 22, 2024

compiler-errors commented May 22, 2024

petrochenkov commented May 22, 2024

petrochenkov commented May 22, 2024

This comment has been minimized.

bors commented May 22, 2024

oli-obk commented May 23, 2024

bors commented May 23, 2024

lqd May 24, 2024 •

edited

Loading

oli-obk May 24, 2024

petrochenkov May 24, 2024

lqd commented Jun 5, 2024

petrochenkov commented Jun 5, 2024

rustc: Use tcx.used_crates(()) more #124976

rustc: Use tcx.used_crates(()) more #124976

Conversation

petrochenkov commented May 10, 2024

rustbot commented May 10, 2024

rustbot commented May 10, 2024

RalfJung May 10, 2024

Choose a reason for hiding this comment

petrochenkov May 22, 2024

Choose a reason for hiding this comment

compiler-errors commented May 22, 2024

oli-obk commented May 22, 2024

This comment has been minimized.

bors commented May 22, 2024

petrochenkov commented May 22, 2024

compiler-errors commented May 22, 2024

petrochenkov commented May 22, 2024

petrochenkov commented May 22, 2024

This comment has been minimized.

bors commented May 22, 2024

oli-obk commented May 23, 2024

bors commented May 23, 2024

lqd May 24, 2024 • edited Loading

Choose a reason for hiding this comment

oli-obk May 24, 2024

Choose a reason for hiding this comment

petrochenkov May 24, 2024

Choose a reason for hiding this comment

lqd commented Jun 5, 2024

petrochenkov commented Jun 5, 2024

rustc: Use `tcx.used_crates(())` more #124976

rustc: Use `tcx.used_crates(())` more #124976

lqd May 24, 2024 •

edited

Loading