Rollup of 8 pull requests #120755

matthiaskrgr · 2024-02-07T22:53:47Z

Successful merges:

resolve: Unload speculatively resolved crates before freezing cstore #119592 (resolve: Unload speculatively resolved crates before freezing cstore)
Make it so that async-fn-in-trait is compatible with a concrete future in implementation #120103 (Make it so that async-fn-in-trait is compatible with a concrete future in implementation)
hir: Make sure all HirIds have corresponding HIR Nodes #120206 (hir: Make sure all HirIds have corresponding HIR Nodes)
match lowering: consistently lower bindings deepest-first #120214 (match lowering: consistently lower bindings deepest-first)
[rustdoc] Correctly generate path for non-local items in source code pages #120596 ([rustdoc] Correctly generate path for non-local items in source code pages)
GVN: also turn moves into copies with projections #120688 (GVN: also turn moves into copies with projections)
docs: also check the inline stmt during redundant link check #120702 (docs: also check the inline stmt during redundant link check)
improve pretty printing for associated items in trait objects #120739 (improve pretty printing for associated items in trait objects)

r? @ghost
@rustbot modify labels: rollup

…rors resolve: Unload speculatively resolved crates before freezing cstore Name resolution sometimes loads additional crates to improve diagnostics (e.g. suggest imports). Not all of these diagnostics result in errors, sometimes they are just warnings, like in rust-lang#117772. If additional crates loaded speculatively stay and gets listed by things like `query crates` then they may produce further errors like duplicated lang items, because lang items from speculatively loaded crates are as good as from non-speculatively loaded crates. They can probably do things like adding unintended impls from speculatively loaded crates to method resolution as well. The extra crates will also get into the crate's metadata as legitimate dependencies. In this PR I remove the speculative crates from cstore when name resolution is finished and cstore is frozen. This is better than e.g. filtering away speculative crates in `query crates` because things like `DefId`s referring to these crates and leaking to later compilation stages can produce ICEs much easier, allowing to detect them. The unloading could potentially be skipped if any errors were reported (to allow using `DefId`s from speculatively loaded crates for recovery), but I didn't do it in this PR because I haven't seen such cases of recovery. We can reconsider later if any relevant ICEs are reported. Unblocks rust-lang#117772.

…oli-obk Make it so that async-fn-in-trait is compatible with a concrete future in implementation There's no technical reason why an AFIT like `async fn foo()` cannot be satisfied with an implementation signature like `fn foo() -> Pin<Box<dyn Future<Output = ()> + 'static>>`. We rejected this previously because we were uncertain about how AFITs worked with refinement, but I don't believe this needs to be a restriction any longer. r? oli-obk

…rrors hir: Make sure all `HirId`s have corresponding HIR `Node`s And then remove `tcx.opt_hir_node(hir_id)` in favor of `tcx.hir_node(hir_id)`.

match lowering: consistently lower bindings deepest-first Currently when lowering match expressions to MIR, we do a funny little dance with the order of bindings. I attempt to explain it in the third commit: we handle refutable (i.e. needing a test) patterns differently than irrefutable ones. This leads to inconsistencies, as reported in rust-lang#120210. The reason we need a dance at all is for situations like: ```rust fn foo1(x: NonCopyStruct) { let y @ NonCopyStruct { copy_field: z } = x; // the above should turn into let z = x.copy_field; let y = x; } ``` Here the `y `````@`````` binding will move out of `x`, so we need to copy the field first. I believe that the inconsistency came about when we fixed rust-lang#69971, and didn't notice that the fix didn't extend to refutable patterns. My guess then is that ordering bindings by "deepest-first, otherwise source order" is a sound choice. This PR implements that (at least I hope, match lowering is hard to follow 🥲). Fixes rust-lang#120210 r? `````@oli-obk````` since you merged the original fix to rust-lang#69971 cc `````@matthewjasper`````

…al-link, r=notriddle [rustdoc] Correctly generate path for non-local items in source code pages While browsing some crates using the "jump to def" feature, I realized that a lot of items didn't have a link generated. The reason is because we only cache foreign items if they appear in the documented API. This means that for the others, we need to infer them. r? `@notriddle`

GVN: also turn moves into copies with projections Fixes rust-lang#120613

docs: also check the inline stmt during redundant link check Fixes rust-lang#120444 This issue was brought about by querying `root::webdavfs::A`, a key that doesn't exist in `doc_link_resolutions`. To avoid a panic, I've altered the gating mechanism to allow this lint pass to be skipped. I'm not certain if this is the best solution. An alternative approach might be to leverage other info from the name resolutions instead of `doc_link_resolutions`. After all, all we need is to get the resolution from a combination of `(module, name)`. However, I believe they would yield the same outcome, both skipping this lint.

…r-errors improve pretty printing for associated items in trait objects * Don't print a binder in front of associated items, because it's not valid syntax. * e.g. print `dyn for<'a> Trait<'a, Assoc = &'a u8>` instead of `dyn for<'a> Trait<'a, for<'a> Assoc = &'a u8>`. * Don't print associated items that are implied by a supertrait bound. * e.g. if we have `trait Sub: Super<Assoc = u8> {}`, then just print `dyn Sub` instead of `dyn Sub<Assoc = u8>`. I've added the test in the first commit, so you can see the diff of the compiler output in the second commit.

matthiaskrgr · 2024-02-07T22:54:07Z

@bors r+ rollup=never p=8

bors · 2024-02-07T22:54:10Z

📌 Commit cd54a0d has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-02-07T23:39:02Z

⌛ Testing commit cd54a0d with merge 0fb1f2b...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119592 (resolve: Unload speculatively resolved crates before freezing cstore) - rust-lang#120103 (Make it so that async-fn-in-trait is compatible with a concrete future in implementation) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120214 (match lowering: consistently lower bindings deepest-first) - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages) - rust-lang#120688 (GVN: also turn moves into copies with projections) - rust-lang#120702 (docs: also check the inline stmt during redundant link check) - rust-lang#120739 (improve pretty printing for associated items in trait objects) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-02-08T00:02:38Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling rustfix v0.6.1
   Compiling compiletest v0.0.0 (/checkout/src/tools/compiletest)
[RUSTC-TIMING] serde_json test:false 1.864
[RUSTC-TIMING] rustfix test:false 0.840
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[group]Clock drift check
  local time: Thu Feb  8 00:02:19 UTC 2024
  network time: Thu, 08 Feb 2024 00:02:19 GMT
##[endgroup]
##[endgroup]
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.

bors · 2024-02-08T00:03:07Z

💔 Test failed - checks-actions

matthiaskrgr · 2024-02-08T00:04:52Z

@bors retry

bors · 2024-02-08T02:08:19Z

⌛ Testing commit cd54a0d with merge f1a3f1e...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119592 (resolve: Unload speculatively resolved crates before freezing cstore) - rust-lang#120103 (Make it so that async-fn-in-trait is compatible with a concrete future in implementation) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120214 (match lowering: consistently lower bindings deepest-first) - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages) - rust-lang#120688 (GVN: also turn moves into copies with projections) - rust-lang#120702 (docs: also check the inline stmt during redundant link check) - rust-lang#120739 (improve pretty printing for associated items in trait objects) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-02-08T02:58:56Z

The job x86_64-gnu-stable failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [rustdoc] tests/rustdoc/jump-to-non-local-method.rs stdout ----

error: htmldocck failed!
status: exit status: 1
command: "/usr/bin/python3" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/jump-to-non-local-method" "/checkout/tests/rustdoc/jump-to-non-local-method.rs"
--- stderr -------------------------------
7: @has check failed
7: @has check failed
 `XPATH PATTERN` did not match
 // @has - '//a[@href="https://doc.rust-lang.org/nightly/core/sync/atomic/struct.AtomicIsize.html"]' 'std::sync::atomic::AtomicIsize'
9: @has check failed
 `XPATH PATTERN` did not match
 // @has - '//a[@href="https://doc.rust-lang.org/nightly/std/io/trait.Read.html"]' 'std::io::Read'
11: @has check failed
 `XPATH PATTERN` did not match
 // @has - '//a[@href="https://doc.rust-lang.org/nightly/std/io/index.html"]' 'std::io'
13: @has check failed
 `XPATH PATTERN` did not match
 // @has - '//a[@href="https://doc.rust-lang.org/nightly/std/process/fn.exit.html"]' 'std::process::exit'
19: @has check failed
 `XPATH PATTERN` did not match
     // @has - '//a[@href="https://doc.rust-lang.org/nightly/std/io/trait.Read.html#tymethod.read"]' 'read'
24: @has check failed
 `XPATH PATTERN` did not match
     // @has - '//a[@href="https://doc.rust-lang.org/nightly/core/sync/atomic/struct.AtomicIsize.html#method.new"]' 'AtomicIsize::new'
31: @has check failed
 `XPATH PATTERN` did not match
     // @has - '//a[@href="https://doc.rust-lang.org/nightly/std/process/fn.exit.html"]' 'exit'
36: @has check failed
 `XPATH PATTERN` did not match
     // @has - '//a[@href="https://doc.rust-lang.org/nightly/core/macro.try.html"]' 'try!'
42: @has check failed
 `XPATH PATTERN` did not match
     // @has - '//a[@href="https://doc.rust-lang.org/nightly/core/cmp/enum.Ordering.html#variant.Less"]' 'Ordering::Less'
44: @has check failed
 `XPATH PATTERN` did not match
     // @has - '//a[@href="https://doc.rust-lang.org/nightly/core/marker/struct.PhantomData.html"]' 'PhantomData'
Encountered 10 errors
------------------------------------------

bors · 2024-02-08T02:59:28Z

💔 Test failed - checks-actions

Nadrieril and others added 29 commits January 25, 2024 02:35

Add tests

3ea464f

Move Or test out of the loop

96ff1a4

Clarify the binding dance

e902878

Put new bindings first in refutable cases too

09d4613

Clarify the new binding dance

0825ad3

Allow desugaring async fn in trait to compatible, concrete future types

16cbdd0

Make the error message better

e65abc0

Make sure refinement still works

1a3214b

Correctly generate path for non-local items in source code pages

b6aea72

Add regression test for non local items link generation

7251120

Unify item relative path computation in one function

898bb7f

Add test.

c151ed4

Also turn moves into copies even if through projections.

6fbd761

resolve: Unload speculatively resolved crates before freezing cstore

a2ab48c

hir: Make sure all HirIds have corresponding HIR Nodes

363b098

hir: Remove fn opt_hir_id and fn opt_span

a61019b

hir: Add some FIXMEs for future work

3e8c8d8

docs: also check the inline stmt during redundant link check

0a50dba

add test for pretty printing trait objects

fd92021

improve pretty printing for trait objects

18e5bbf

address review comments and add more tests

c636c7a

Rollup merge of rust-lang#120206 - petrochenkov:somehir, r=compiler-e…

0666cbe

…rrors hir: Make sure all `HirId`s have corresponding HIR `Node`s And then remove `tcx.opt_hir_node(hir_id)` in favor of `tcx.hir_node(hir_id)`.

Rollup merge of rust-lang#120688 - cjgillot:gvn-partial-move, r=oli-obk

55d078e

GVN: also turn moves into copies with projections Fixes rust-lang#120613

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 7, 2024

rustbot added 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. rollup A PR which is a rollup labels Feb 7, 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 Feb 7, 2024

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 Feb 8, 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 Feb 8, 2024

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 Feb 8, 2024

matthiaskrgr mentioned this pull request Feb 8, 2024

docs: also check the inline stmt during redundant link check #120702

Merged

matthiaskrgr closed this Feb 8, 2024

matthiaskrgr deleted the rollup-e8q53ab branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #120755

Rollup of 8 pull requests #120755

matthiaskrgr commented Feb 7, 2024

matthiaskrgr commented Feb 7, 2024

bors commented Feb 7, 2024

bors commented Feb 7, 2024

rust-log-analyzer commented Feb 8, 2024

bors commented Feb 8, 2024

matthiaskrgr commented Feb 8, 2024

bors commented Feb 8, 2024

rust-log-analyzer commented Feb 8, 2024

bors commented Feb 8, 2024

Rollup of 8 pull requests #120755

Rollup of 8 pull requests #120755

Conversation

matthiaskrgr commented Feb 7, 2024

matthiaskrgr commented Feb 7, 2024

bors commented Feb 7, 2024

bors commented Feb 7, 2024

rust-log-analyzer commented Feb 8, 2024

bors commented Feb 8, 2024

matthiaskrgr commented Feb 8, 2024

bors commented Feb 8, 2024

rust-log-analyzer commented Feb 8, 2024

bors commented Feb 8, 2024