Skip to content

[beta] backport rust-analyzer lockfile-path fix#153530

Merged
rust-bors[bot] merged 2 commits intorust-lang:betafrom
lnicola:lockfile-path-backport
Mar 9, 2026
Merged

[beta] backport rust-analyzer lockfile-path fix#153530
rust-bors[bot] merged 2 commits intorust-lang:betafrom
lnicola:lockfile-path-backport

Conversation

@lnicola
Copy link
Member

@lnicola lnicola commented Mar 7, 2026 •
edited
Loading

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2026
@rustbot rustbot added the T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. label Mar 7, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 7, 2026

r? @jieyouxu

rustbot has assigned @jieyouxu.
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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Fallback group: @Mark-Simulacrum, @jieyouxu
  • @Mark-Simulacrum, @jieyouxu expanded to Mark-Simulacrum, jieyouxu
  • Random selection from Mark-Simulacrum, jieyouxu

@jieyouxu
Copy link
Member

jieyouxu commented Mar 7, 2026

r? rust-analyzer

@rustbot rustbot assigned flodiebold and unassigned jieyouxu Mar 7, 2026
@lnicola lnicola mentioned this pull request Mar 8, 2026
Closed
@Veykril
Copy link
Member

Veykril commented Mar 8, 2026

@bors r+

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

📌 Commit d2cb7e4 has been approved by Veykril

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Mar 8, 2026
@cuviper
Copy link
Member

cuviper commented Mar 8, 2026

@bors rollup=never

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot pushed a commit that referenced this pull request Mar 8, 2026
@bors
Auto merge of #153530 - lnicola:lockfile-path-backport, r=Veykril
19c5af4 
[beta] backport rust-analyzer `lockfile-path` fix

Closes rust-lang/rust-analyzer#21761
Closes rust-lang/rust-analyzer#21783
@rust-bors rust-bors bot 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 Mar 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

💔 Test for 19c5af4 failed: CI. Failed job:

@lnicola
Copy link
Member Author

lnicola commented Mar 8, 2026

The hosted runner lost communication with the server. Anything in your workflow that terminates the runner process, starves it for CPU/Memory, or blocks its network access can cause this error.

@bors retry spurious

@rust-bors rust-bors bot 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 Mar 8, 2026
@rust-bors rust-bors bot mentioned this pull request Mar 8, 2026
Merged
@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot pushed a commit that referenced this pull request Mar 8, 2026
@bors
Auto merge of #153530 - lnicola:lockfile-path-backport, r=Veykril
fcc4433 
[beta] backport rust-analyzer `lockfile-path` fix

Closes rust-lang/rust-analyzer#21761
Closes rust-lang/rust-analyzer#21783
@lnicola
Copy link
Member Author

lnicola commented Mar 8, 2026

I think this got stuck on x86_64-msvc-1.

@rust-bors rust-bors bot 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 Mar 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

💥 Test timed out after 21600s

@lnicola
Copy link
Member Author

lnicola commented Mar 8, 2026

@bors retry

@rust-bors rust-bors bot 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 Mar 8, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 9, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 9, 2026

☀️ Test successful - CI
Approved by: Veykril
Duration: 3h 6m 51s
Pushing 94a8e82 to beta...

@rust-bors rust-bors bot merged commit 94a8e82 into rust-lang:beta Mar 9, 2026
12 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Mar 9, 2026
@lnicola lnicola deleted the lockfile-path-backport branch March 10, 2026 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Veykril Veykril Veykril approved these changes

Assignees

@flodiebold flodiebold

Labels

merged-by-bors This PR was explicitly merged by bors. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.95.0

Development

Successfully merging this pull request may close these issues.

6 participants

@lnicola @rustbot @jieyouxu @Veykril @cuviper @flodiebold