Skip to content

chore: update Rust to 1.85.1#4340

Merged
basvandijk merged 35 commits intomasterfrom
update-rust-and-refactor-code
May 12, 2025
Merged

chore: update Rust to 1.85.1#4340
basvandijk merged 35 commits intomasterfrom
update-rust-and-refactor-code

Conversation

@sasa-tomic
Copy link
Contributor

@sasa-tomic sasa-tomic commented Mar 12, 2025

Major Changes

  • Rust Version: Updated Rust toolchain from version 1.84.0 to 1.85.1.
  • Code Refactoring: Reduce verbosity and satisfy clippy by refining several conditional and map operations across multiple modules.

Additional Changes

Refactored test assertions and other minor code improvements throughout the code base.

- **Rust Version**: Update Rust toolchain and Bazel configuration to Rust 1.85.0.
- **Refactoring**:
  - Remove redundant `map` and `map_err` methods where conversion is unnecessary.
  - Simplify bitwise operations with clearer grouping.
- **Tests and Comments**: Updated relevant tests and comments.
@sasa-tomic sasa-tomic self-assigned this Mar 12, 2025
@github-actions github-actions bot added the chore label Mar 12, 2025
@sasa-tomic sasa-tomic changed the title chore: update Rust to 1.85.0 and refactor code chore: update Rust to 1.85.0 Mar 12, 2025
@sasa-tomic sasa-tomic marked this pull request as ready for review March 12, 2025 14:19
@sasa-tomic sasa-tomic requested review from a team as code owners March 12, 2025 14:19
@sasa-tomic sasa-tomic requested a review from a team March 12, 2025 14:19
@sasa-tomic sasa-tomic requested a review from a team as a code owner March 12, 2025 14:19
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this pull request affects the behavior of any canister owned by
the Governance team, remember to update the corresponding
unreleased_changes.md file(s).

To acknowldge this reminder (and unblock the PR), dismiss this
code review by going to the bottom of the pull request page, and
supply one of the following reasons:

  1. Done.

  2. No canister behavior changes.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this pull request affects the behavior of any canister owned by
the Governance team, remember to update the corresponding
unreleased_changes.md file(s).

To acknowldge this reminder (and unblock the PR), dismiss this
code review by going to the bottom of the pull request page, and
supply one of the following reasons:

  1. Done.

  2. No canister behavior changes.

…ba89009272f40803a49640211565e7

Image tag: 840f94ead19b1ae2da20554e111b7ca9ab0fe37e76c42b0dd06e69f370df73a0
@github-actions
Copy link
Contributor

Run URL: https://github.com/dfinity/ic/actions/runs/13813642063

New container image: sha256:1de2eef8662eb58cbb911b844bb0afcc19ba89009272f40803a49640211565e7
New container tag: 840f94ead19b1ae2da20554e111b7ca9ab0fe37e76c42b0dd06e69f370df73a0

@kpop-dfinity
Copy link
Contributor

kpop-dfinity commented Mar 12, 2025

I looked into upgrading rust a couple of days ago and I concluded (I might be wrong, though!) that we need to upgrade rules_rust first (like @basvandijk did) but in order to upgrade rules_rust we need to remove --noincompatible_enable_cc_toolchain_resolution flag here, which fortunately is currently being done in this PR.

See also this discussion on Slack

@sasa-tomic sasa-tomic removed request for a team April 7, 2025 14:23
…c00cda858ad6612cda28b231b80896

Image tag: 3426fa29677ab9de5778c28c093194f9a45946bfaa7b910d0fc0bfa893e2a13a
@github-actions
Copy link
Contributor

github-actions bot commented Apr 7, 2025

Run URL: https://github.com/dfinity/ic/actions/runs/14311735972

New container image: sha256:efe6edcd9a9e169843a02f91af98b29514c00cda858ad6612cda28b231b80896
New container tag: 3426fa29677ab9de5778c28c093194f9a45946bfaa7b910d0fc0bfa893e2a13a

@sasa-tomic
Copy link
Contributor Author

We are once more waiting for the hermetic CC to be enabled. Hopefully happens soon.

@stiegerc
Copy link
Contributor

stiegerc commented May 5, 2025

Any update on when this might go through?

@sasa-tomic
Copy link
Contributor Author

Any update on when this might go through?

@stiegerc I asked IDX if there has been any progress on solving the blocker, let's see.

@sasa-tomic
Copy link
Contributor Author

sasa-tomic commented May 9, 2025

And we finally have a green PR!
Now waiting for @basvandijk to merge all other dependent PRs (e.g. #4574) and please merge this PR after them. Thanks Bas and everyone else who helped get the PR green!

@basvandijk basvandijk enabled auto-merge May 12, 2025 10:07
@basvandijk basvandijk added this pull request to the merge queue May 12, 2025
Merged via the queue into master with commit f68a58f May 12, 2025
25 checks passed
@basvandijk basvandijk deleted the update-rust-and-refactor-code branch May 12, 2025 11:51
@kpop-dfinity
Copy link
Contributor

🥳

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.