Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Update sysinfo version to 0.31.2 #128436

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Update sysinfo version to 0.31.2 #128436

merged 1 commit into from
Aug 2, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jul 31, 2024 •
edited
Loading

I needed to update memchr version (which was pinned in 36a1679). So let's see if it triggers the linker issue.

try-job: x86_64-mingw

@rustbot
Copy link
Collaborator

rustbot commented Jul 31, 2024

r? @Mark-Simulacrum

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

@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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 31, 2024
@GuillaumeGomez
Copy link
Member Author

Seems like it's fine?

r? @clubby789

@GuillaumeGomez GuillaumeGomez marked this pull request as ready for review July 31, 2024 15:25
@rustbot rustbot assigned clubby789 and unassigned Mark-Simulacrum Jul 31, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 31, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in src/tools/opt-dist

cc @Kobzol

@klensy
Copy link
Contributor

klensy commented Jul 31, 2024

You should try x86_64-pc-windows-gnu or x86_64-pc-windows-msvc?

@GuillaumeGomez
Copy link
Member Author

I have set try-job. Let's give it a try.

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 31, 2024
@bors
Auto merge of rust-lang#128436 - GuillaumeGomez:update-sysinfo, r=<try>
e997e9c 
Update sysinfo version to 0.31.0

I needed to update `memchr` version (which was pinned in rust-lang@36a1679). So let's see if it triggers the linker issue.

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 31, 2024

⌛ Trying commit c972a0e with merge e997e9c...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 31, 2024

💔 Test failed - checks-actions

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 31, 2024
@clubby789
Copy link
Contributor

Looks like the sysinfo API changed - not sure why the other jobs passed? 🤔

@GuillaumeGomez
Copy link
Member Author

I'm wondering the same thing. Checking what changed...

@GuillaumeGomez
Copy link
Member Author

Let's try again.

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 31, 2024
@bors
Auto merge of rust-lang#128436 - GuillaumeGomez:update-sysinfo, r=<try>
544ccf0 
Update sysinfo version to 0.31.0

I needed to update `memchr` version (which was pinned in rust-lang@36a1679). So let's see if it triggers the linker issue.

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 31, 2024

⌛ Trying commit fa2711b with merge 544ccf0...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 31, 2024

💔 Test failed - checks-actions

@GuillaumeGomez
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jul 31, 2024

⌛ Trying commit 101235d with merge 3d698d8...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 31, 2024
@bors
Auto merge of rust-lang#128436 - GuillaumeGomez:update-sysinfo, r=<try>
3d698d8 
Update sysinfo version to 0.31.0

I needed to update `memchr` version (which was pinned in rust-lang@36a1679). So let's see if it triggers the linker issue.

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Aug 1, 2024

💔 Test failed - checks-actions

@GuillaumeGomez
Copy link
Member Author

So still broken. Unfortunately, without updating memchr version, we can't update sysinfo because of:

Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.04s
Building stage0 library artifacts (x86_64-unknown-linux-gnu)
    Updating crates.io index
error: failed to select a version for `memchr`.
    ... required by package `bstr v1.9.0`
    ... which satisfies dependency `bstr = "^1.9.0"` of package `sysinfo v0.31.0`
    ... which satisfies dependency `sysinfo = "^0.31"` of package `opt-dist v0.1.0 (rust/src/tools/opt-dist)`
versions that meet the requirements `^2.7.1` are: 2.7.4, 2.7.3, 2.7.2, 2.7.1

all possible versions conflict with previously selected packages.

  previously selected package `memchr v2.5.0`
    ... which satisfies dependency `memchr = "=2.5.0"` of package `rustc_ast v0.0.0 (rust/compiler/rustc_ast)`
    ... which satisfies path dependency `rustc_ast` of package `rustc_codegen_ssa v0.0.0 (rust/compiler/rustc_codegen_ssa)`
    ... which satisfies path dependency `rustc_codegen_ssa` of package `rustc-main v0.0.0 (rust/compiler/rustc)`

failed to select a version for `memchr` which could resolve this conflict
Build completed unsuccessfully in 0:00:01

Which is quite surprising since I thought cargo was able to build the same crate with different version for one project...

@klensy
Copy link
Contributor

klensy commented Aug 1, 2024

You're author of sysinfo, is it required to use latest versions of memchr?

@clubby789
Copy link
Contributor

Discussion of the issue is on Zulip here

@GuillaumeGomez
Copy link
Member Author

You're author of sysinfo, is it required to use latest versions of memchr?

I suppose it's not.

@ChrisDenton
Copy link
Member

You could try using version = "=2.5.0, 2.7.1" to both satisfy rustc and allow other people to use the more recent version.

@GuillaumeGomez
Copy link
Member Author

Gonna give it a try.

@GuillaumeGomez
Copy link
Member Author

I think just writing 2.5 allows all versions from 2.5 until 3.0 (not included). So should be fine.

@GuillaumeGomez GuillaumeGomez changed the title Update sysinfo version to 0.31.0 Update sysinfo version to 0.31.2 Aug 1, 2024
@GuillaumeGomez
Copy link
Member Author

Actually I also needed to remove the bstr dependency. Well, I guess sysinfo will be faster to compile the first time, so not too bad in the end. ^^'

Let's try again.

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2024
@bors
Auto merge of rust-lang#128436 - GuillaumeGomez:update-sysinfo, r=<try>
a080ac4 
Update sysinfo version to 0.31.2

I needed to update `memchr` version (which was pinned in rust-lang@36a1679). So let's see if it triggers the linker issue.

try-job: x86_64-mingw
@bors
Copy link
Contributor

bors commented Aug 1, 2024

⌛ Trying commit f449586 with merge a080ac4...

@bors
Copy link
Contributor

bors commented Aug 1, 2024

☀️ Try build successful - checks-actions
Build commit: a080ac4 (a080ac45dd0b3b4972fe76fc8682994d9dc7de42)

@GuillaumeGomez
Copy link
Member Author

Seems like it's all good now!

@clubby789
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 1, 2024

📌 Commit f449586 has been approved by clubby789

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 Aug 1, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 1, 2024
@tgross35
Rollup merge of rust-lang#128436 - GuillaumeGomez:update-sysinfo, r=c…
c5289b4 
…lubby789

Update sysinfo version to 0.31.2

I needed to update `memchr` version (which was pinned in rust-lang@36a1679). So let's see if it triggers the linker issue.

try-job: x86_64-mingw
@tgross35 tgross35 mentioned this pull request Aug 1, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2024
@bors
Auto merge of rust-lang#128519 - tgross35:rollup-cq66zmj, r=tgross35
0b4f423 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#123994 (Use Default visibility for rustc-generated C symbol declarations)
 - rust-lang#126818 (Better handle suggestions for the already present code and fix some suggestions)
 - rust-lang#127624 (Migrate and rename `issue-47551`, `issue-35164` and `issue-69368` `run-make` tests to rmake)
 - rust-lang#128361 (Migrate `link-cfg` and `rustdoc-default-output` `run-make` tests to rmake)
 - rust-lang#128436 (Update sysinfo version to 0.31.2)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 2, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2024
@bors
Auto merge of rust-lang#128529 - matthiaskrgr:rollup-gzq2slo, r=matth…
2cec7a8 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#126818 (Better handle suggestions for the already present code and fix some suggestions)
 - rust-lang#128436 (Update sysinfo version to 0.31.2)
 - rust-lang#128453 (raw_eq: using it on bytes with provenance is not UB (outside const-eval))
 - rust-lang#128491 ([`macro_metavar_expr_concat`] Dogfooding)
 - rust-lang#128494 (MIR required_consts, mentioned_items: ensure we do not forget to fill these lists)
 - rust-lang#128521 (rustdoc: Remove dead opaque_tys rendering logic)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2dabaa0 into rust-lang:master Aug 2, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 2, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2024
@rust-timer
Unrolled build for rust-lang#128436
41363ea 
Rollup merge of rust-lang#128436 - GuillaumeGomez:update-sysinfo, r=clubby789

Update sysinfo version to 0.31.2

I needed to update `memchr` version (which was pinned in rust-lang@36a1679). So let's see if it triggers the linker issue.

try-job: x86_64-mingw
@GuillaumeGomez GuillaumeGomez deleted the update-sysinfo branch August 2, 2024 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@clubby789 clubby789

Labels
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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
9 participants
@GuillaumeGomez @rustbot @klensy @bors @rust-log-analyzer @clubby789 @Kobzol @ChrisDenton @Mark-Simulacrum