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.

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

Update cargo #118541

Merged
merged 1 commit into from
Dec 3, 2023
Merged

Update cargo #118541

merged 1 commit into from
Dec 3, 2023

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Dec 2, 2023

27 commits in 26333c732095d207aa05932ce863d850fb309386..623b788496b3e51dc2f9282373cf0f6971a229b5
2023-11-28 20:07:39 +0000 to 2023-12-02 18:10:03 +0000

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 2, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 2, 2023

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Dec 2, 2023

📌 Commit 65cf2fc has been approved by weihanglo

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 2, 2023
@bors
Copy link
Contributor

bors commented Dec 2, 2023

⌛ Testing commit 65cf2fc with merge 8f97d1d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 2, 2023
Update cargo

25 commits in 26333c732095d207aa05932ce863d850fb309386..58fb23140972092a12f7011d17a7db1d99e3eacf
2023-11-28 20:07:39 +0000 to 2023-12-02 14:15:16 +0000
- test(install): use TCP connection instead of thread sleep (rust-lang/cargo#13099)
- test(mdman): Switch to snapbox (rust-lang/cargo#13098)
- Include declared list of features in fingerprint for `-Zcheck-cfg` (rust-lang/cargo#13012)
- chore(deps): update compatible (rust-lang/cargo#13083)
- chore(ci): Always update gix packages together (rust-lang/cargo#13093)
- chore(deps): update rust crate windows-sys to 0.52 (rust-lang/cargo#13089)
- refactor(toml): Decouple logic from schema (rust-lang/cargo#13080)
- Have cargo add --optional <dep> create a <dep> = "dep:<dep> feature (rust-lang/cargo#13071)
- Add `--public` for `cargo add` (rust-lang/cargo#13046)
- chore(deps): update rust crate toml_edit to 0.21.0 (rust-lang/cargo#13088)
- chore(deps): update rust crate rusqlite to 0.30.0 (rust-lang/cargo#13087)
- test(trim-paths): exercise with real world debugger (rust-lang/cargo#13091)
- Fixed uninstall a running binary failed on Windows (rust-lang/cargo#13053)
- chore(deps): update rust crate itertools to 0.12.0 (rust-lang/cargo#13086)
- Add more options to registry test support. (rust-lang/cargo#13085)
- Don't filter on workspace members when scraping doc examples (rust-lang/cargo#13077)
- Remove the outdated comment (rust-lang/cargo#13076)
- fix(resolver): Remove unused public-deps error handling (rust-lang/cargo#13036)
- Fixes error count display is different when there's only one error left (rust-lang/cargo#12484)
- fix: reorder `--remap-path-prefix` flags for `-Zbuild-std` (rust-lang/cargo#13065)
- remove jobserver env var in some tests (rust-lang/cargo#13072)
- doc: clarify different target has different set of `CARGO_CFG_*` values (rust-lang/cargo#13069)
- docs: remove review capacity notice in PR template (rust-lang/cargo#13070)
- chore(deps): update rust crate openssl to 0.10.60 [security] (rust-lang/cargo#13068)
- fix(resolver): De-prioritize no-rust-version in MSRV resolver (rust-lang/cargo#13066)

r? ghost
@bors
Copy link
Contributor

bors commented Dec 2, 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 2, 2023
@weihanglo
Copy link
Member Author

Hi @heiher or any loongarch expert.

Cargo recently bumped from OpenSSL 1.1.1 to 3.0 https://github.com/rust-lang/cargo/pull/13068/files. And it seems that OpenSSL 3.1 is missing something on loongarch64:

    crypto/aes/vpaes-loongarch64.S: Assembler messages:
    crypto/aes/vpaes-loongarch64.S:24: Error: no match insn: vori.b	$vr1,$vr9,0
    crypto/aes/vpaes-loongarch64.S:26: Error: no match insn: vld	$vr2,$r12,0
    crypto/aes/vpaes-loongarch64.S:27: Error: no match insn: vandn.v	$vr1,$vr1,$vr0
    crypto/aes/vpaes-loongarch64.S:28: Error: no match insn: vld	$vr5,$r9,0
    crypto/aes/vpaes-loongarch64.S:29: Error: no match insn: vsrli.w	$vr1,$vr1,4 

A similar fix was landed in 3.2 openssl/openssl@84a0b1b. I wonder if it also fixes our failure. If yes, we need to get openssl-src pulled in OpenSSL 3.2 and release a new version of it.

I am not an expert of that, and seek helps from exports of that domain.

@weihanglo
Copy link
Member Author

In the meantime, I'll revert the bump to unblock the update.

weihanglo added a commit to rust-lang/cargo that referenced this pull request Dec 2, 2023
Reverts #13068

`openssl@0.10.160` switches to OpenSSL v3,
which causes Cargo build failure on loongarch64.

See <rust-lang/rust#118541 (comment)>
bors added a commit to rust-lang/cargo that referenced this pull request Dec 2, 2023
…vulnerability, r=ehuss

Revert "chore(deps): update rust crate openssl to 0.10.60 [security]"

Reverts #13068

`openssl@0.10.160` switches to OpenSSL v3,
which causes Cargo build failure on loongarch64.

See <rust-lang/rust#118541 (comment)>
@weihanglo
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Dec 2, 2023

📌 Commit c1f6925 has been approved by weihanglo

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 2, 2023
@bors
Copy link
Contributor

bors commented Dec 2, 2023

⌛ Testing commit c1f6925 with merge 1ca8b71...

@bors
Copy link
Contributor

bors commented Dec 3, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 1ca8b71 to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Dec 3, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 1ca8b71 to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Dec 3, 2023
@bors bors merged commit 1ca8b71 into rust-lang:master Dec 3, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 3, 2023
@weihanglo weihanglo deleted the update-cargo branch December 3, 2023 02:03
@heiher
Copy link
Contributor

heiher commented Dec 3, 2023

Hi @heiher or any loongarch expert.

Cargo recently bumped from OpenSSL 1.1.1 to 3.0 https://github.com/rust-lang/cargo/pull/13068/files. And it seems that OpenSSL 3.1 is missing something on loongarch64:

    crypto/aes/vpaes-loongarch64.S: Assembler messages:
    crypto/aes/vpaes-loongarch64.S:24: Error: no match insn: vori.b	$vr1,$vr9,0
    crypto/aes/vpaes-loongarch64.S:26: Error: no match insn: vld	$vr2,$r12,0
    crypto/aes/vpaes-loongarch64.S:27: Error: no match insn: vandn.v	$vr1,$vr1,$vr0
    crypto/aes/vpaes-loongarch64.S:28: Error: no match insn: vld	$vr5,$r9,0
    crypto/aes/vpaes-loongarch64.S:29: Error: no match insn: vsrli.w	$vr1,$vr1,4 

A similar fix was landed in 3.2 openssl/openssl@84a0b1b. I wonder if it also fixes our failure. If yes, we need to get openssl-src pulled in OpenSSL 3.2 and release a new version of it.

I am not an expert of that, and seek helps from exports of that domain.

Thanks for the workaround.

Yes. I also found this problem in rustup, we are waiting for openssl-src-rs to be bumped to 3.2.0.

rust-lang/rustup#3536

It seems that something unexpected happened with this upgrade.

alexcrichton/openssl-src-rs#217

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1ca8b71): 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)
2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
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: 672.65s -> 672.446s (-0.03%)
Artifact size: 313.95 MiB -> 314.11 MiB (0.05%)

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