Skip to content

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

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 5 commits into from
Jan 5, 2024

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Dec 12, 2023

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 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
@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2023

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

&["rust-analyzer/in-rust-tree".to_owned()],
&["in-rust-tree".to_owned()],
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you missed this part

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

@onur-ozkan 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
@nnethercote
Copy link
Contributor

I tested and it fixes my original problem, thanks!

@Veykril
Copy link
Member Author

Veykril commented Dec 13, 2023

@rustbot ready

@rustbot 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
@onur-ozkan
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 13, 2023

📌 Commit e623cc1 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors 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
@bors
Copy link
Collaborator

bors commented Dec 13, 2023

⌛ Testing commit e623cc1 with merge c365c95...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 13, 2023
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

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Dec 13, 2023

💔 Test failed - checks-actions

@bors 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
Copy link
Member Author

Veykril commented Dec 15, 2023

I don't understand the issue here 😕

@bjorn3
Copy link
Member

bjorn3 commented Dec 15, 2023

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
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 15, 2023

📌 Commit 8aa9c48 has been approved by onur-ozkan

It is now in the queue for this repository.

@rust-log-analyzer

This comment has been minimized.

@Veykril
Copy link
Member Author

Veykril commented Jan 4, 2024

Made a mistake when resolving a conflict while rebasing earlier

@onur-ozkan
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 4, 2024

📌 Commit abf0822 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors 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
Copy link
Collaborator

bors commented Jan 4, 2024

⌛ Testing commit abf0822 with merge 12f1474...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 4, 2024
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
Copy link
Collaborator

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
Copy link
Collaborator

bors commented Jan 5, 2024

💔 Test failed - checks-actions

@bors 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
@lnicola
Copy link
Member

lnicola commented Jan 5, 2024

@bors retry runner quit

@bors 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
Copy link
Collaborator

bors commented Jan 5, 2024

⌛ Testing commit abf0822 with merge a59a980...

@bors
Copy link
Collaborator

bors commented Jan 5, 2024

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

1 similar comment
@bors
Copy link
Collaborator

bors commented Jan 5, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 5, 2024
@bors bors merged commit a59a980 into rust-lang:master Jan 5, 2024
@rustbot rustbot added this to the 1.77.0 milestone Jan 5, 2024
@rust-timer
Copy link
Collaborator

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%)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.