Skip to content

build: update MSRV to nightly-2025-12-11#285

Merged
DemesneGH merged 5 commits intoapache:mainfrom
DemesneGH:main
Mar 12, 2026
Merged

build: update MSRV to nightly-2025-12-11#285
DemesneGH merged 5 commits intoapache:mainfrom
DemesneGH:main

Conversation

@DemesneGH
Copy link
Contributor

Changes:

  • Updated setup_std_dependencies.sh to clone the pinned Rust source and apply patches from teaclave-crates trustzone-sdk: add ported std and libc for OP-TEE std TAs teaclave-crates#10. After that PR merged the clone source should be updated in setup_std_dependencies.sh.
  • Resolved compilation and Clippy errors introduced by the newer compiler version.
  • Continued use of Xargo for this transition, with XARGO_RUST_SRC pointing to the new library/ workspace.

Status:

  • Basic CI passes.
  • Temporarily excluded std-for-dev-docker and cargo-optee-* for this PR. Since the build toolchain will be overhauled in the next step, these environments will be updated accordingly at that time.

Next Steps:

  • Migrate from Xargo to cargo -Z build-std as the primary build tool, as Xargo is outdated and no longer updated.
  • Fix remaining CI errors in the excluded components.

@ivila

This comment was marked as outdated.

{
"arch": "aarch64",
"data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
Copy link
Contributor

Choose a reason for hiding this comment

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

There are duplicate files in the cargo-optee directory. Should these be updated as well, or would it be better to remove them entirely?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The modification of cargo-optee is planned in the follow-up PRs, after this PR merged I will remove the Xargo and update our building system. To reduce the effort of multiple modifications I plan to adjust the cargo-optee after that.
For this PR, I suggest we omit the CI errors of cargo-optee and std-dev-docker.

ifeq ($(BUILDER),xargo)
EXTRA_FLAGS =
else
EXTRA_FLAGS = -Z build-std=core,alloc -Z build-std-features=panic_immediate_abort
Copy link
Contributor

Choose a reason for hiding this comment

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

cargo-optee adds the build-std flag by default; I think we should remove that as well.

// Add no-std specific flags to avoid the linking error of _Unwind_Resume
if !config.std {
cmd.arg("-Z").arg("build-std=core,alloc");
cmd.arg("-Z")
.arg("build-std-features=panic_immediate_abort");
}

Fix errors introduced by new clippy version:
- empty_line_after_doc_comments
- manual_div_ceil
- mismatched_lifetime_syntaxes
- doc_lazy_continuation
- doc_overindented_list_items
@DemesneGH
Copy link
Contributor Author

Reorganized the commits, will merge this PR later if there're no follow-up comments today, thanks!

@DemesneGH DemesneGH merged commit 746ee39 into apache:main Mar 12, 2026
25 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants