Skip to content
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

Jump to bottom

⬆️ rust-analyzer #91909

Merged
merged 1 commit into from
Dec 18, 2021
Merged

⬆️ rust-analyzer #91909

merged 1 commit into from
Dec 18, 2021

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Dec 14, 2021

r? @ghost

@lnicola
Copy link
Member Author

lnicola commented Dec 14, 2021

@bors r+ rollup=iffy

(libc bumps are prone to fail on FreeBSD)

@bors
Copy link
Contributor

bors commented Dec 14, 2021

📌 Commit c771970 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 Dec 14, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 14, 2021
@matthiaskrgr
Rollup merge of rust-lang#91909 - lnicola:rust-analyzer-2021-12-14, r…
7f89718 
…=lnicola

⬆️ rust-analyzer

r? `@ghost`
This was referenced Dec 14, 2021
Closed
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 14, 2021
@matthiaskrgr
Rollup merge of rust-lang#91909 - lnicola:rust-analyzer-2021-12-14, r…
d910cc1 
…=lnicola

⬆️ rust-analyzer

r? ``@ghost``
@matthiaskrgr
Copy link
Member

@bors rollup=never
looks like there might be some linking failure, happened in a rollup 2/2 times:
#91914 (comment)

@camelid
Copy link
Member

camelid commented Dec 14, 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 Dec 14, 2021
@lnicola
Copy link
Member Author

lnicola commented Dec 15, 2021

Sigh, libc pulls in another library.

@lnicola lnicola mentioned this pull request Dec 15, 2021
Merged
@lnicola
Copy link
Member Author

lnicola commented Dec 15, 2021

Can someone r+ #91967? Thanks.

@matthiaskrgr
Copy link
Member

matthiaskrgr commented Dec 15, 2021 •
edited
Loading

So the PR changed some dependencies..?
I'm a but surprised because I didn't see any Cargo.lock changes in the diff.

EDIT: I mean the Cargo.lock of the rustc repo root.

@lnicola
Copy link
Member Author

lnicola commented Dec 15, 2021 •
edited
Loading

This PR updates rust-analyzer, which bumped libc 0.2.108 to 0.2.109 in rust-lang/rust-analyzer@9a624ab#diff-13ee4b2252c9e516a0547f2891aa2105c3ca71c6d7a1e682c69be97998dfc87e, then to 0.2.111 in rust-lang/rust-analyzer@8782e8e#diff-13ee4b2252c9e516a0547f2891aa2105c3ca71c6d7a1e682c69be97998dfc87eR807. This is rust-analyzer's own Cargo.lock.

libc started using libdevstat in rust-lang/libc@ac6e16b.

@lnicola lnicola mentioned this pull request Dec 15, 2021
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 15, 2021
@matthiaskrgr
Rollup merge of rust-lang#91967 - lnicola:freebsd-devstat, r=kennytm
754bde6 
Pull in libdevstat on FreeBSD

Similar to rust-lang#90495, spotted in rust-lang#91909.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#91967 - lnicola:freebsd-devstat, r=kennytm
5a4c1c7 
Pull in libdevstat on FreeBSD

Similar to rust-lang#90495, spotted in rust-lang#91909.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#91967 - lnicola:freebsd-devstat, r=kennytm
cf68528 
Pull in libdevstat on FreeBSD

Similar to rust-lang#90495, spotted in rust-lang#91909.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#91967 - lnicola:freebsd-devstat, r=kennytm
ff3dd19 
Pull in libdevstat on FreeBSD

Similar to rust-lang#90495, spotted in rust-lang#91909.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#91967 - lnicola:freebsd-devstat, r=kennytm
355ed98 
Pull in libdevstat on FreeBSD

Similar to rust-lang#90495, spotted in rust-lang#91909.
@lnicola
Copy link
Member Author

lnicola commented Dec 17, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 17, 2021

📌 Commit c771970 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 Dec 17, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 18, 2021
@matthiaskrgr
Rollup merge of rust-lang#91909 - lnicola:rust-analyzer-2021-12-14, r…
c72b921 
…=lnicola

⬆️ rust-analyzer

r? `@ghost`
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 18, 2021
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 18, 2021
@matthiaskrgr
Rollup merge of rust-lang#91909 - lnicola:rust-analyzer-2021-12-14, r…
18b0e9b 
…=lnicola

⬆️ rust-analyzer

r? ``@ghost``
This was referenced Dec 18, 2021
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 18, 2021
@bors
Auto merge of rust-lang#92062 - matthiaskrgr:rollup-en3p4sb, r=matthi…
d3f3004 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#91439 (Mark defaulted `PartialEq`/`PartialOrd` methods as const)
 - rust-lang#91516 (Improve suggestion to change struct field to &mut)
 - rust-lang#91896 (Remove `in_band_lifetimes` for `rustc_passes`)
 - rust-lang#91909 (:arrow_up: rust-analyzer)
 - rust-lang#91922 (Remove `in_band_lifetimes` from `rustc_mir_dataflow`)
 - rust-lang#92025 (Revert "socket ancillary data implementation for dragonflybsd.")
 - rust-lang#92030 (Update stdlib to the 2021 edition)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e6b99fa into rust-lang:master Dec 18, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 18, 2021
@lnicola lnicola deleted the rust-analyzer-2021-12-14 branch December 18, 2021 14:10
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.59.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lnicola @bors @matthiaskrgr @camelid @rustbot