Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps #118861

Veykril · 2023-12-12T09:21:14Z

Some context: This came up in https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/libraryfying.20match.20checking.3F where test and check behaved differently for rust-analyzer
r? @onur-ozkan

rustbot · 2023-12-12T09:21:24Z

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Veykril · 2023-12-12T09:22:28Z

src/bootstrap/src/core/build_steps/check.rs

-            &["rust-analyzer/in-rust-tree".to_owned()],
+            &["in-rust-tree".to_owned()],


I changed these prefixed ones given we didn't prefix the sysroot-abi feature either in the other places, and I was kind of confused that these worked in the first place

onur-ozkan

I guess you missed this part

rust/src/bootstrap/src/core/build_steps/tool.rs

Line 650 in 8c2c233

extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()],

nnethercote · 2023-12-13T01:49:06Z

I tested and it fixes my original problem, thanks!

Veykril · 2023-12-13T09:22:30Z

@rustbot ready

onur-ozkan · 2023-12-13T10:15:48Z

@bors r+

bors · 2023-12-13T10:15:51Z

📌 Commit e623cc1 has been approved by onur-ozkan

It is now in the queue for this repository.

bors · 2023-12-13T12:30:00Z

⌛ Testing commit e623cc1 with merge c365c95...

Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps Some context: This came up in https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/libraryfying.20match.20checking.3F where `test` and `check` behaved differently for rust-analyzer r? `@onur-ozkan`

bors · 2023-12-13T12:46:37Z

💔 Test failed - checks-actions

Veykril · 2023-12-15T16:51:40Z

I don't understand the issue here 😕

bjorn3 · 2023-12-15T17:26:17Z

rust-analyzer-proc-macro-srv is marked as ToolStd and thus assumed to not depend on the compiler libraries. Try changing it to ToolRustc.

onur-ozkan · 2023-12-15T18:04:13Z

@bors r+

bors · 2023-12-15T18:04:16Z

📌 Commit 8aa9c48 has been approved by onur-ozkan

It is now in the queue for this repository.

Veykril · 2024-01-04T14:13:18Z

Made a mistake when resolving a conflict while rebasing earlier

onur-ozkan · 2024-01-04T15:11:12Z

@bors r+

bors · 2024-01-04T15:11:14Z

📌 Commit abf0822 has been approved by onur-ozkan

It is now in the queue for this repository.

bors · 2024-01-04T23:46:48Z

⌛ Testing commit abf0822 with merge 12f1474...

Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps Some context: This came up in https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/libraryfying.20match.20checking.3F where `test` and `check` behaved differently for rust-analyzer r? `@onur-ozkan`

rust-log-analyzer · 2024-01-05T00:02:27Z

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 rustc_builtin_macros v0.0.0 (/checkout/compiler/rustc_builtin_macros)
[RUSTC-TIMING] rustc_ast_passes test:false 7.142
[RUSTC-TIMING] rustc_expand test:false 19.825
[RUSTC-TIMING] rustc_builtin_macros test:false 19.461
##[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: Fri Jan  5 00:02:08 UTC 2024
  network time: Fri, 05 Jan 2024 00:02:08 GMT
##[endgroup]
##[endgroup]
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.

bors · 2024-01-05T00:03:03Z

💔 Test failed - checks-actions

lnicola · 2024-01-05T00:05:31Z

@bors retry runner quit

bors · 2024-01-05T02:53:48Z

⌛ Testing commit abf0822 with merge a59a980...

bors · 2024-01-05T04:50:48Z

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing a59a980 to master...

bors · 2024-01-05T04:50:48Z

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing a59a980 to master...

rust-timer · 2024-01-05T06:12:12Z

Finished benchmarking commit (a59a980): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	5.5%	[5.5%, 5.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.5%	[-4.5%, -4.5%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 669.247s -> 670.544s (0.19%)
Artifact size: 311.06 MiB -> 311.06 MiB (0.00%)

rustbot assigned onur-ozkan Dec 12, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 12, 2023

Veykril commented Dec 12, 2023

View reviewed changes

onur-ozkan reviewed Dec 12, 2023

View reviewed changes

Veykril force-pushed the r-a-in-tree branch from 8c2c233 to 66bb2d7 Compare December 12, 2023 10:43

onur-ozkan 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 Dec 12, 2023

Veykril force-pushed the r-a-in-tree branch from 66bb2d7 to e623cc1 Compare December 13, 2023 09:21

rustbot 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 Dec 13, 2023

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 Dec 13, 2023

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 Dec 13, 2023

Veykril force-pushed the r-a-in-tree branch from e623cc1 to 8aa9c48 Compare December 15, 2023 17:28

Veykril requested a review from onur-ozkan December 15, 2023 17:32

Veykril added 3 commits January 4, 2024 11:02

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

9a9ba92

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

80095aa

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

3e3d08c

Veykril force-pushed the r-a-in-tree branch from 3f43180 to 3e3d08c Compare January 4, 2024 10:02

This comment has been minimized.

Sign in to view

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

abf0822

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 Jan 4, 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 Jan 5, 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 Jan 5, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 5, 2024

bors merged commit a59a980 into rust-lang:master Jan 5, 2024
12 checks passed

rustbot added this to the 1.77.0 milestone Jan 5, 2024

Veykril deleted the r-a-in-tree branch January 5, 2024 08:51

zjp-CN mentioned this pull request Jan 11, 2024

proc macro not expanded: failed to write request (os error 232) on Windows rust-lang/rust-analyzer#16306

Closed

RalfJung mentioned this pull request Apr 27, 2024

Sync from rustc rust-lang/rust-analyzer#17152

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps #118861

Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps #118861

Veykril commented Dec 12, 2023 •

edited

Loading

rustbot commented Dec 12, 2023

Veykril Dec 12, 2023

onur-ozkan left a comment

nnethercote commented Dec 13, 2023

Veykril commented Dec 13, 2023

onur-ozkan commented Dec 13, 2023

bors commented Dec 13, 2023

bors commented Dec 13, 2023

This comment has been minimized.

bors commented Dec 13, 2023

Veykril commented Dec 15, 2023 •

edited

Loading

bjorn3 commented Dec 15, 2023

onur-ozkan commented Dec 15, 2023

bors commented Dec 15, 2023

This comment has been minimized.

Veykril commented Jan 4, 2024 •

edited

Loading

onur-ozkan commented Jan 4, 2024

bors commented Jan 4, 2024

bors commented Jan 4, 2024

rust-log-analyzer commented Jan 5, 2024

bors commented Jan 5, 2024

lnicola commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

rust-timer commented Jan 5, 2024

		&["rust-analyzer/in-rust-tree".to_owned()],
		&["in-rust-tree".to_owned()],

Set the in-rust-tree feature for all rust-analyzer{-proc-macro-srv} steps #118861

Set the in-rust-tree feature for all rust-analyzer{-proc-macro-srv} steps #118861

Conversation

Veykril commented Dec 12, 2023 • edited Loading

rustbot commented Dec 12, 2023

Veykril Dec 12, 2023

Choose a reason for hiding this comment

onur-ozkan left a comment

Choose a reason for hiding this comment

nnethercote commented Dec 13, 2023

Veykril commented Dec 13, 2023

onur-ozkan commented Dec 13, 2023

bors commented Dec 13, 2023

bors commented Dec 13, 2023

This comment has been minimized.

bors commented Dec 13, 2023

Veykril commented Dec 15, 2023 • edited Loading

bjorn3 commented Dec 15, 2023

onur-ozkan commented Dec 15, 2023

bors commented Dec 15, 2023

This comment has been minimized.

Veykril commented Jan 4, 2024 • edited Loading

onur-ozkan commented Jan 4, 2024

bors commented Jan 4, 2024

bors commented Jan 4, 2024

rust-log-analyzer commented Jan 5, 2024

bors commented Jan 5, 2024

lnicola commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

rust-timer commented Jan 5, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps #118861

Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps #118861

Veykril commented Dec 12, 2023 •

edited

Loading

Veykril commented Dec 15, 2023 •

edited

Loading

Veykril commented Jan 4, 2024 •

edited

Loading