Skip to content

chore: Upgrade rustc to 1.93.1 #9113

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

Merged
michael-weigelt merged 19 commits into from
Mar 6, 2026
Merged

chore: Upgrade rustc to 1.93.1 #9113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
31eefac
bump rustc version
michael-weigelt Mar 2, 2026
6b37217
retrigger
michael-weigelt Mar 2, 2026
edbb635
Updating container image to sha256:32a9ec8c924fe7939cf208b93296a4a89a…
Mar 2, 2026
7a14dde
Merge branch 'master' into mwe/rustc
michael-weigelt Mar 2, 2026
f8a1e65
Updating container image to sha256:8724b6a02a524cd7d929d73dd51a500f85…
Mar 2, 2026
bac8758
clippy
michael-weigelt Mar 2, 2026
edb8db7
clippy
michael-weigelt Mar 2, 2026
ceef059
clippy
michael-weigelt Mar 2, 2026
9646726
clippy
michael-weigelt Mar 2, 2026
0c9d175
clippy
michael-weigelt Mar 2, 2026
57a3fe1
clippy
michael-weigelt Mar 2, 2026
291f25d
Merge remote-tracking branch 'origin' into mwe/rustc
michael-weigelt Mar 2, 2026
1a1a590
fix snapshot test
mraszyk Mar 2, 2026
97800b7
Merge branch 'master' into mwe/rustc
michael-weigelt Mar 3, 2026
1b78d06
Merge branch 'master' into mwe/rustc
mraszyk Mar 6, 2026
e046138
Updating container images to tag: a72bab43cf0ba5a4de20cacc82247b38c64…
Mar 6, 2026
60bfaa0
Merge branch 'master' into mwe/rustc
michael-weigelt Mar 6, 2026
4fec79f
canbench results
michael-weigelt Mar 6, 2026
3d329df
clippy
michael-weigelt Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "ghcr.io/dfinity/ic-dev@sha256:fe06783d9cf8e9fc901a5996d9fc8b726f15769f2fd6bd86969d1fbbf77ae025",
"image": "ghcr.io/dfinity/ic-dev@sha256:a98782800df599b3d1501f0da9fbe1dff7a8a401a86c0371eaab7ae0503d3696",
"remoteUser": "ubuntu",
"privileged": true,
"runArgs": [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-bn-recovery-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host
--mount type=tmpfs,target="/home/buildifier/.local/share/containers"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: &dind-large-setup
labels: dind-large
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 90
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr-only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: &dind-small-setup
labels: dind-small
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --mount type=tmpfs,target="/tmp/containers"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container-api-bn-recovery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host
--mount type=tmpfs,target="/home/buildifier/.local/share/containers"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container-scan-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pocket-ic-tests-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
bazel-build-pocket-ic:
name: Bazel Build PocketIC
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 90
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rate-limits-backend-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
labels: dind-large

container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/tmp/containers"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: &dind-large-setup
labels: dind-large
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 180
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rosetta-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
environment: DockerHub
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/salt-sharing-canister-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
labels: dind-large

container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/tmp/containers"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: &dind-large-setup
labels: dind-large
container: &container-setup
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 720 # 12 hours
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-rust-bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# see linux-x86-64 runner group
labels: rust-benchmarks
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
# running on bare metal machine using ubuntu user
options: --user ubuntu --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 720 # 12 hours
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 60 # 1 hour
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/system-tests-benchmarks-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on:
labels: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
timeout-minutes: 480
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-mainnet-canister-revisions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
labels: dind-small
environment: CREATE_PR
container:
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
image: ghcr.io/dfinity/ic-build@sha256:0a0cff0b12c7586c2f312c739176924edf0c9e71df92f382eba836913da9f1c6
options: >-
-e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/tmp/containers"
env:
Expand Down
2 changes: 1 addition & 1 deletion bazel/rust.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ archive_override(
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
rust.toolchain(
edition = "2024",
versions = ["1.90.0"],
versions = ["1.93.1"],
)

# Repin with `CARGO_BAZEL_REPIN=true bazel build @crate_index//...`
Expand Down
2 changes: 1 addition & 1 deletion ci/container/TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
525439d98911d50acdc59a1c5b83ddb5f0c76a4f9ee1cbdca1f41143fb2f0602
a72bab43cf0ba5a4de20cacc82247b38c64a779ace23157d0aa200d3af7c41d1
70 changes: 35 additions & 35 deletions rs/bitcoin/ckbtc/minter/canbench/results.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,185 +2,185 @@ benches:
build_estimate_retrieve_btc_fee_1_50k_sats:
total:
calls: 1
instructions: 2689868
instructions: 2778437
heap_increase: 0
stable_memory_increase: 0
scopes:
build_unsigned_transaction_from_inputs:
calls: 1
instructions: 3398
instructions: 3363
heap_increase: 0
stable_memory_increase: 0
greedy:
calls: 1
instructions: 3817
instructions: 3733
heap_increase: 0
stable_memory_increase: 0
utxos_selection:
calls: 1
instructions: 2683797
instructions: 2772376
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_1_50k_sats:
total:
calls: 1
instructions: 2691988
instructions: 2780551
heap_increase: 0
stable_memory_increase: 0
scopes:
build_unsigned_transaction:
calls: 1
instructions: 2689404
instructions: 2777970
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_from_inputs:
calls: 1
instructions: 3398
instructions: 3363
heap_increase: 0
stable_memory_increase: 0
greedy:
calls: 1
instructions: 3817
instructions: 3733
heap_increase: 0
stable_memory_increase: 0
utxos_selection:
calls: 1
instructions: 2683797
instructions: 2772376
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_2_100k_sats:
total:
calls: 1
instructions: 2692080
instructions: 2780613
heap_increase: 0
stable_memory_increase: 0
scopes:
build_unsigned_transaction:
calls: 1
instructions: 2689496
instructions: 2778032
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_from_inputs:
calls: 1
instructions: 3398
instructions: 3363
heap_increase: 0
stable_memory_increase: 0
greedy:
calls: 1
instructions: 3909
instructions: 3795
heap_increase: 0
stable_memory_increase: 0
utxos_selection:
calls: 1
instructions: 2683889
instructions: 2772438
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_3_1m_sats:
total:
calls: 1
instructions: 2693275
instructions: 2781894
heap_increase: 0
stable_memory_increase: 0
scopes:
build_unsigned_transaction:
calls: 1
instructions: 2690691
instructions: 2779313
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_from_inputs:
calls: 1
instructions: 3398
instructions: 3363
heap_increase: 0
stable_memory_increase: 0
greedy:
calls: 1
instructions: 5000
instructions: 4969
heap_increase: 0
stable_memory_increase: 0
utxos_selection:
calls: 1
instructions: 2685084
instructions: 2773719
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_4_10m_sats:
total:
calls: 1
instructions: 2693671
instructions: 2782234
heap_increase: 0
stable_memory_increase: 0
scopes:
build_unsigned_transaction:
calls: 1
instructions: 2691087
instructions: 2779653
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_from_inputs:
calls: 1
instructions: 3398
instructions: 3363
heap_increase: 0
stable_memory_increase: 0
greedy:
calls: 1
instructions: 5480
instructions: 5396
heap_increase: 0
stable_memory_increase: 0
utxos_selection:
calls: 1
instructions: 2685480
instructions: 2774059
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_5_1_btc:
total:
calls: 1
instructions: 3121938
instructions: 3203594
heap_increase: 0
stable_memory_increase: 0
scopes:
build_unsigned_transaction:
calls: 1
instructions: 3119130
instructions: 3200734
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_from_inputs:
calls: 1
instructions: 40098
instructions: 40053
heap_increase: 0
stable_memory_increase: 0
greedy:
calls: 1
instructions: 404240
instructions: 397314
heap_increase: 0
stable_memory_increase: 0
utxos_selection:
calls: 1
instructions: 3076823
instructions: 3158450
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_6_10_btc:
total:
calls: 1
instructions: 7840038
instructions: 7857970
heap_increase: 0
stable_memory_increase: 0
scopes:
build_unsigned_transaction:
calls: 1
instructions: 7837190
instructions: 7855125
heap_increase: 0
stable_memory_increase: 0
build_unsigned_transaction_from_inputs:
calls: 1
instructions: 441572
instructions: 442277
heap_increase: 0
stable_memory_increase: 0
greedy:
calls: 1
instructions: 4768255
instructions: 4698479
heap_increase: 0
stable_memory_increase: 0
utxos_selection:
calls: 1
instructions: 7393409
instructions: 7410617
heap_increase: 0
stable_memory_increase: 0
version: 0.4.0
version: 0.4.1
5 changes: 3 additions & 2 deletions rs/cup_explorer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,9 @@ pub fn verify(
let version = RegistryVersion::new(version);
match client.get_cup_contents(subnet_id, version) {
Ok(contents) => {
if contents.value.is_some() && contents.version == version {
let cup_contents = contents.value.unwrap();
if let Some(cup_contents) = contents.value
&& contents.version == version
{
println!("Found Recovery proposal at version {version}:");
println!("{:>20}: {}", "TIME", cup_contents.time);
println!("{:>20}: {}", "HEIGHT", cup_contents.height);
Expand Down
Loading
Loading