Skip to content

Use a generic trait bound for serialize_property_path #331

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −5
Open

Use a generic trait bound for serialize_property_path #331

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
21 changes: 16 additions & 5 deletions src/hostcalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,10 @@ extern "C" {
) -> Status;
}

pub fn get_property(path: Vec<&str>) -> Result<Option<Bytes>, Status> {
pub fn get_property<'a, P>(path: P) -> Result<Option<Bytes>, Status>
where
P: AsRef<[&'a str]>,
{
let serialized_path = utils::serialize_property_path(path);
let mut return_data: *mut u8 = null_mut();
let mut return_size: usize = 0;
Expand Down Expand Up @@ -451,7 +454,10 @@ extern "C" {
) -> Status;
}

pub fn set_property(path: Vec<&str>, value: Option<&[u8]>) -> Result<(), Status> {
pub fn set_property<'a, P>(path: P, value: Option<&[u8]>) -> Result<(), Status>
where
P: AsRef<[&'a str]>,
{
let serialized_path = utils::serialize_property_path(path);
unsafe {
match proxy_set_property(
Expand Down Expand Up @@ -1208,16 +1214,21 @@ mod utils {
use crate::types::Bytes;
use std::convert::TryFrom;

pub(super) fn serialize_property_path(path: Vec<&str>) -> Bytes {
pub(super) fn serialize_property_path<'a, P>(path: P) -> Bytes
where
P: AsRef<[&'a str]>,
{
let path = path.as_ref();

if path.is_empty() {
return Vec::new();
}
let mut size: usize = 0;
for part in &path {
for &part in path {
size += part.len() + 1;
}
let mut bytes: Bytes = Vec::with_capacity(size);
for part in &path {
for &part in path {
bytes.extend_from_slice(part.as_bytes());
bytes.push(0);
}
Expand Down