internal: sync from downstream #16317

lnicola · 2024-01-09T06:46:54Z

No description provided.

…} steps

…m-ra

lnicola · 2024-01-09T06:46:59Z

@bors r+

bors · 2024-01-09T06:47:02Z

📌 Commit f52f2f9 has been approved by lnicola

It is now in the queue for this repository.

bors · 2024-01-09T06:48:09Z

⌛ Testing commit f52f2f9 with merge f4eef1c...

internal: sync from downstream

bors · 2024-01-09T06:52:07Z

💔 Test failed - checks-actions

lnicola · 2024-01-09T06:57:06Z

@bors r-

lnicola · 2024-01-09T07:00:13Z

.github/workflows/ci.yaml

@@ -48,6 +48,7 @@ jobs:
      CC: deny_c
      RUST_CHANNEL: "${{ needs.changes.outputs.proc_macros == 'true' && 'nightly' || 'stable' }}"
      USE_SYSROOT_ABI: "${{ needs.changes.outputs.proc_macros == 'true' && '--features sysroot-abi' || '' }}"
+      RUSTUP_RUSTC_DEV: "${{ needs.changes.outputs.proc_macros == 'true' && 'rustc-dev' || '' }}"


We want this, right?

No we shouldn't need this 🤔 our CI should not rely on the rustc crates

Veykril · 2024-01-09T07:50:02Z

crates/proc-macro-srv/src/lib.rs

 #![warn(rust_2018_idioms, unused_lifetimes)]
 #![allow(unreachable_pub, internal_features)]

 extern crate proc_macro;
+extern crate rustc_driver as _;


This is missing a cfg #[cfg(feature = "in-rust-tree")]

Veykril · 2024-01-09T07:50:25Z

crates/proc-macro-srv/src/lib.rs

@@ -11,11 +11,12 @@
 //!   rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…

 #![cfg(any(feature = "sysroot-abi", rust_analyzer))]
-#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]
+#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span, rustc_private)]


This feature needs to be gated #[cfg_attr(feature = "in-rust-tree", feature(rustc_private)]

lnicola · 2024-01-09T07:55:31Z

crates/proc-macro-srv/src/lib.rs

@@ -11,11 +11,14 @@
 //!   rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…

 #![cfg(any(feature = "sysroot-abi", rust_analyzer))]
+#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]


Like this, right?

Veykril · 2024-01-09T07:55:43Z

Thanks for doing the syncs as always, especially since they seem to have been more trouble the past weeks 😅

Veykril · 2024-01-09T07:58:46Z

CI failure is due to a new lint on nightly fwiw, since this touches the proc-macro server source CI runs the nightly toolchain. You can probably just pick the changes from this file here https://github.com/rust-lang/rust-analyzer/pull/16309/files#diff-0449230bb140c3330091dc8be2f8b5d227e6875704429de5116f428fcbe7b532

Veykril · 2024-01-09T08:10:29Z

🤨 I can't repro that, and nothing should be causing that here, might be spurious let's see
@bors r+

bors · 2024-01-09T08:10:32Z

📌 Commit b0b2b1c has been approved by Veykril

It is now in the queue for this repository.

bors · 2024-01-09T08:11:38Z

⌛ Testing commit b0b2b1c with merge de290b8...

internal: sync from downstream

bors · 2024-01-09T08:17:49Z

💔 Test failed - checks-actions

Veykril · 2024-01-09T08:22:20Z

Hm, feel free to just cfg that test out for now (since ignoring is rejected by CI as well), I'll look into what's going on there later. Probably related to the dylib linking changes in the sysroot, fairly sure the error there is incorrect and its something else.

lnicola · 2024-01-09T08:26:05Z

I can reproduce the failure using RUN_SLOW_TESTS=1 cargo test -p rust-analyzer --test slow-tests --features sysroot-abi resolve_proc_macro.

lnicola · 2024-01-09T08:27:55Z

crates/rust-analyzer/tests/slow-tests/main.rs

@@ -835,7 +835,7 @@ fn main() {
 #[cfg(any(feature = "sysroot-abi", rust_analyzer))]
 fn resolve_proc_macro() {
    use expect_test::expect;
-    if skip_slow_tests() {
+    if skip_slow_tests() || true {


Added an early exit here.

Veykril · 2024-01-09T08:30:01Z

Ugh right, I forgot to set the slow test var, repros for me as well then, that's good. Will take a look at that in a bit.

Veykril · 2024-01-09T08:35:50Z

Fairly certain the cause is #16307 (which didn't run the test)

@bors r+

bors · 2024-01-09T08:35:52Z

📌 Commit 4413aeb has been approved by Veykril

It is now in the queue for this repository.

bors · 2024-01-09T08:36:59Z

⌛ Testing commit 4413aeb with merge f5f7dda...

lnicola · 2024-01-09T08:38:56Z

Thanks for doing the syncs as always, especially since they seem to have been more trouble the past weeks

Months, you mean 😄. Anyway, it's the least I can do.

Fairly certain the cause is #16307 (which didn't run the test)

Yeah, reverting that fixes the failure :-(.

bors · 2024-01-09T08:48:42Z

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing f5f7dda to master...

Veykril · 2024-01-09T08:50:10Z

Ye okay I know why, now that we no longer save the document in the vfs we can't filter out set_file_content calls that don't change the document value, and something seems to report changing the file content multiple times hence the failure.

lnicola · 2024-01-09T08:55:39Z

2024-01-09T08:54:56.688606Z  INFO vfs: set_file_contents(/tmp/testdir/87771_0/bar/src/lib.rs)
2024-01-09T08:54:56.688821Z  INFO vfs: set_file_contents(/tmp/testdir/87771_0/foo/src/main.rs)
2024-01-09T08:54:56.689274Z  INFO vfs: set_file_contents(/tmp/testdir/87771_0/bar/Cargo.toml)
2024-01-09T08:54:56.689285Z  INFO vfs: set_file_contents(/tmp/testdir/87771_0/bar/src/lib.rs)
2024-01-09T08:54:56.689294Z  INFO vfs: set_file_contents(/tmp/testdir/87771_0/foo/Cargo.toml)
2024-01-09T08:54:56.689300Z  INFO vfs: set_file_contents(/tmp/testdir/87771_0/foo/src/main.rs)

CC #14730?

Veykril · 2024-01-09T09:01:40Z

Yes, that pretty much (and another smaller issue).

Veykril and others added 8 commits January 4, 2024 11:02

Set the in-rust-tree` feature for all rust-analyzer{-proc-macro-srv…

b83f487

…} steps

Imply sysroot-abi feature when in-rust-tree is set

ab22869

Add extern crate rustc_driver to proc-macro-srv-cli

d480525

Set sysroot-abi flag for proc-macro-cli when in-rust-tree is set

8390d2a

Set proc-macro-test/sysroot-abi with proc-macro-srv/sysroot-abi

79fa976

Merge commit 'af40101841c45aa75b56f4e9ca745369da8fb4ba' into sync-fro…

3afeb24

…m-ra

Merge branch 'release' into sync-from-rust

c6a02e3

Merge branch 'master' into sync-from-rust

f52f2f9

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

bors added a commit that referenced this pull request Jan 9, 2024

Auto merge of #16317 - lnicola:sync-from-rust, r=lnicola

f4eef1c

internal: sync from downstream

lnicola commented Jan 9, 2024

View reviewed changes

Veykril reviewed Jan 9, 2024

View reviewed changes

Try to fix feature gates

0ae7373

lnicola force-pushed the sync-from-rust branch from 312cf43 to 0ae7373 Compare January 9, 2024 07:53

lnicola commented Jan 9, 2024

View reviewed changes

Fix allow(dead_code)

b0b2b1c

bors added a commit that referenced this pull request Jan 9, 2024

Auto merge of #16317 - lnicola:sync-from-rust, r=Veykril

de290b8

internal: sync from downstream

Temporarily disable resolve_proc_macro test

4413aeb

lnicola commented Jan 9, 2024

View reviewed changes

bors merged commit f5f7dda into rust-lang:master Jan 9, 2024
10 checks passed

lnicola deleted the sync-from-rust branch January 9, 2024 08:48

bors mentioned this pull request Jan 9, 2024

fix: Remove sysroot-abi feature flag from proc-macro-test #16271

Merged

philips-software-forest-releaser bot mentioned this pull request May 28, 2024

chore(deps,cpp): update ms-vscode.cmake-tools philips-software/amp-devcontainer#422

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

internal: sync from downstream #16317

internal: sync from downstream #16317

lnicola commented Jan 9, 2024

lnicola commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

lnicola commented Jan 9, 2024

lnicola Jan 9, 2024

Veykril Jan 9, 2024

Veykril Jan 9, 2024

Veykril Jan 9, 2024

lnicola Jan 9, 2024

Veykril Jan 9, 2024

Veykril commented Jan 9, 2024

Veykril commented Jan 9, 2024

Veykril commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

Veykril commented Jan 9, 2024

lnicola commented Jan 9, 2024

lnicola Jan 9, 2024

Veykril commented Jan 9, 2024

Veykril commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

lnicola commented Jan 9, 2024 •

edited

bors commented Jan 9, 2024

Veykril commented Jan 9, 2024

lnicola commented Jan 9, 2024

Veykril commented Jan 9, 2024

internal: sync from downstream #16317

internal: sync from downstream #16317

Conversation

lnicola commented Jan 9, 2024

lnicola commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

lnicola commented Jan 9, 2024

lnicola Jan 9, 2024

Choose a reason for hiding this comment

Veykril Jan 9, 2024

Choose a reason for hiding this comment

Veykril Jan 9, 2024

Choose a reason for hiding this comment

Veykril Jan 9, 2024

Choose a reason for hiding this comment

lnicola Jan 9, 2024

Choose a reason for hiding this comment

Veykril Jan 9, 2024

Choose a reason for hiding this comment

Veykril commented Jan 9, 2024

Veykril commented Jan 9, 2024

Veykril commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

Veykril commented Jan 9, 2024

lnicola commented Jan 9, 2024

lnicola Jan 9, 2024

Choose a reason for hiding this comment

Veykril commented Jan 9, 2024

Veykril commented Jan 9, 2024

bors commented Jan 9, 2024

bors commented Jan 9, 2024

lnicola commented Jan 9, 2024 • edited

bors commented Jan 9, 2024

Veykril commented Jan 9, 2024

lnicola commented Jan 9, 2024

Veykril commented Jan 9, 2024

lnicola commented Jan 9, 2024 •

edited