Skip to content

Add conversion from Rust status to FfiStatus #54

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
copybara-service merged 1 commit into from
Dec 16, 2025
Merged

Add conversion from Rust status to FfiStatus #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions shell_wrapper/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,15 @@ impl From<StatusError> for ffi::FfiStatus {
}
}

impl From<Status> for ffi::FfiStatus {
fn from(status: Status) -> Self {
match status {
Ok(()) => ffi::FfiStatus { code: 0, message: cxx::UniquePtr::null() },
Err(error) => error.into(),
}
}
}

pub fn rust_status_from_cpp(status: ffi::FfiStatus) -> Status {
if status.code == 0 {
Ok(())
Expand Down Expand Up @@ -418,4 +427,20 @@ mod tests {
expect_eq!(&rust_status.as_ref().err().unwrap().code(), &StatusErrorCode::Cancelled);
expect_eq!(&rust_status.as_ref().err().unwrap().message_bytes(), &b"test");
}

#[gtest]
fn test_ffi_status_from_ok_status() {
let rust_status = Ok(());
let ffi_status: ffi::FfiStatus = rust_status.into();
expect_eq!(ffi_status.code, 0);
expect_eq!(ffi_status.message.is_null(), true);
}

#[gtest]
fn test_ffi_status_from_non_ok_status() {
let rust_status = Err(StatusError::new_untracked(StatusErrorCode::Cancelled, "test"));
let ffi_status: ffi::FfiStatus = rust_status.into();
expect_eq!(ffi_status.code, StatusErrorCode::Cancelled as i32);
expect_eq!(ffi_status.message.as_bytes(), b"test");
}
}
Loading