Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f24bfa authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge changes from topic "fixed-size-array-rust" 

* changes:
  libbinder_rs: Support fixed-size arrays
  libbinder_rs: PartialEq for ParcelFileDescriptor
parents 1f5c2091 56168f24

libs/binder/rust/src/parcel/file_descriptor.rs

+10 −0
Original line number Diff line number Diff line
@@ -60,6 +60,16 @@ impl IntoRawFd for ParcelFileDescriptor { 
    }

}



impl PartialEq for ParcelFileDescriptor {

    // Since ParcelFileDescriptors own the FD, if this function ever returns true (and it is used to

    // compare two different objects), then it would imply that an FD is double-owned.

    fn eq(&self, other: &Self) -> bool {

        self.as_raw_fd() == other.as_raw_fd()

    }

}



impl Eq for ParcelFileDescriptor {}



impl Serialize for ParcelFileDescriptor {

    fn serialize(&self, parcel: &mut BorrowedParcel<'_>) -> Result<()> {

        let fd = self.0.as_raw_fd();

libs/binder/rust/src/parcel/parcelable.rs

+33 −0
Original line number Diff line number Diff line
@@ -652,6 +652,39 @@ impl<T: DeserializeArray> DeserializeOption for Vec<T> { 
    }

}



impl<T: SerializeArray, const N: usize> Serialize for [T; N] {

    fn serialize(&self, parcel: &mut BorrowedParcel<'_>) -> Result<()> {

        // forwards to T::serialize_array.

        SerializeArray::serialize_array(self, parcel)

    }

}



impl<T: SerializeArray, const N: usize> SerializeOption for [T; N] {

    fn serialize_option(this: Option<&Self>, parcel: &mut BorrowedParcel<'_>) -> Result<()> {

        SerializeOption::serialize_option(this.map(|arr| &arr[..]), parcel)

    }

}



impl<T: SerializeArray, const N: usize> SerializeArray for [T; N] {}



impl<T: DeserializeArray, const N: usize> Deserialize for [T; N] {

    fn deserialize(parcel: &BorrowedParcel<'_>) -> Result<Self> {

        let vec = DeserializeArray::deserialize_array(parcel)

            .transpose()

            .unwrap_or(Err(StatusCode::UNEXPECTED_NULL))?;

        vec.try_into().or(Err(StatusCode::BAD_VALUE))

    }

}



impl<T: DeserializeArray, const N: usize> DeserializeOption for [T; N] {

    fn deserialize_option(parcel: &BorrowedParcel<'_>) -> Result<Option<Self>> {

        let vec = DeserializeArray::deserialize_array(parcel)?;

        vec.map(|v| v.try_into().or(Err(StatusCode::BAD_VALUE))).transpose()

    }

}



impl<T: DeserializeArray, const N: usize> DeserializeArray for [T; N] {}



impl Serialize for Stability {

    fn serialize(&self, parcel: &mut BorrowedParcel<'_>) -> Result<()> {

        i32::from(*self).serialize(parcel)