Skip to content

refactor: reduce raw result boilerplate and simplify small patterns - #326

Merged
ivila merged 3 commits into
apache:mainfrom
ivila:opt/simplify-codes
Oct 9, 2026
Merged

ivila merged 3 commits into
apache:mainfrom
ivila:opt/simplify-codes

Conversation

@ivila

@ivila ivila commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

A pure refactor that shrinks repetitive boilerplate across the crates, with no
behavior change and no public API change. Nearly 60 hand-written match blocks
on raw TEE/TEEC result codes are folded into two small crate-internal helpers,
and a handful of nested match/Option patterns are simplified.

ivila added 3 commits October 9, 2026 11:12
Add crate-internal tee_check/tee_check_with_origin and
teec_check/teec_check_with_origin helpers in the error modules and
replace the repeated Ok(())/Err(from_raw_error) arms with them. Let
Error::new and Error::from_raw_error delegate to From<ErrorKind>, and
simplify the remaining small option and match patterns in optee-teec.
Error conversion, origin handling, and return values are unchanged.
Rewrite open, put, get, and delete without nested matches, using
map_err(...)? for storage errors and ok_or_else(...) for missing
values, and chain the checked_mul/checked_add overflow checks into
map. Error messages and returned values are unchanged.
…d helpers

Use as_deref().unwrap_or() for the header file name and PathBuf::join
in the systest build script, and is_ok_and plus unwrap_or_else for
the plugin output checks. No behavior change.
@ivila ivila added the refactor label Oct 9, 2026
@ivila
ivila merged commit 2f403f8 into apache:main Oct 9, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant