Skip to content

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Nov 1, 2021

r? @ghost

@lnicola
Copy link
Member Author

lnicola commented Nov 1, 2021

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 1, 2021

📌 Commit a97bfdc has been approved by lnicola

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 1, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 1, 2021
…=lnicola

⬆️ rust-analyzer

r? `@ghost`
@matthiaskrgr
Copy link
Member

Linking failed in a rollup #90479 (comment)
but I hope that's just spurious.. :s

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 2, 2021
…=lnicola

⬆️ rust-analyzer

r? `@ghost`
@lnicola
Copy link
Member Author

lnicola commented Nov 2, 2021

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 2, 2021
@lnicola
Copy link
Member Author

lnicola commented Nov 2, 2021

Caused by rust-lang/libc#2451, we need to pull in libkvm in the Rust CI image.

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 2, 2021
Pull in `libkvm` on FreeBSD

This is needed when updating `libc` after rust-lang/libc#2451.

Spotted in rust-lang#90464 where it caused `rust-analyzer` to fail to link.

Similar to rust-lang#88676.
@lnicola
Copy link
Member Author

lnicola commented Nov 2, 2021

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Nov 2, 2021

📌 Commit a97bfdc has been approved by lnicola

@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 Nov 2, 2021
@bors
Copy link
Collaborator

bors commented Nov 2, 2021

⌛ Testing commit a97bfdc with merge 6f40fa4...

@bors
Copy link
Collaborator

bors commented Nov 3, 2021

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 6f40fa4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 3, 2021
@bors bors merged commit 6f40fa4 into rust-lang:master Nov 3, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 3, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6f40fa4): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@lnicola lnicola deleted the rust-analyzer-2021-11-01 branch November 3, 2021 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants