Skip to content

Introduce try_get list methods #285

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
merged 1 commit into from
Aug 29, 2022
Merged

Introduce try_get list methods #285

Show file tree
Hide file tree
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
16 changes: 16 additions & 0 deletions capnp/src/any_pointer_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ impl <'a> Reader<'a> {
assert!(index < self.len());
crate::any_pointer::Reader::new(self.reader.get_pointer_element(index))
}

pub fn try_get(self, index : u32) -> Option<crate::any_pointer::Reader<'a>> {
if index < self.len() {
Some(crate::any_pointer::Reader::new(self.reader.get_pointer_element(index)))
} else {
None
}
}
}

impl <'a> IndexMove<u32, Result<crate::any_pointer::Reader<'a>>> for Reader<'a>{
Expand Down Expand Up @@ -92,6 +100,14 @@ impl <'a> Builder<'a> {
crate::any_pointer::Builder::new(self.builder.get_pointer_element(index))
}

pub fn try_get(self, index : u32) -> Option<crate::any_pointer::Builder<'a>> {
if index < self.len() {
Some(crate::any_pointer::Builder::new(self.builder.get_pointer_element(index)))
} else {
None
}
}

pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
Builder {builder: self.builder.reborrow()}
}
Expand Down
16 changes: 16 additions & 0 deletions capnp/src/capability_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ impl <'a, T> Reader<'a, T> where T: FromClientHook {
assert!(index < self.len());
Ok(FromClientHook::new(self.reader.get_pointer_element(index).get_capability()?))
}

pub fn try_get(self, index: u32) -> Option<Result<T>> {
if index < self.len() {
Some(self.reader.get_pointer_element(index).get_capability().map(FromClientHook::new))
} else {
None
}
}
}

impl <'a, T> IndexMove<u32, Result<T>> for Reader<'a, T> where T: FromClientHook {
Expand Down Expand Up @@ -133,6 +141,14 @@ impl <'a, T> Builder<'a, T> where T: FromClientHook {
assert!(index < self.len());
Ok(FromClientHook::new(self.builder.get_pointer_element(index).get_capability()?))
}

pub fn try_get(self, index: u32) -> Option<Result<T>> {
if index < self.len() {
Some(self.builder.get_pointer_element(index).get_capability().map(FromClientHook::new))
} else {
None
}
}
}

impl <'a, T> crate::traits::SetPointerBuilder for Reader<'a, T>
Expand Down
16 changes: 16 additions & 0 deletions capnp/src/data_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ impl <'a> Reader<'a> {
assert!(index < self.len());
self.reader.get_pointer_element(index).get_data(None)
}

pub fn try_get(self, index : u32) -> Option<Result<crate::data::Reader<'a>>> {
if index < self.len() {
Some(self.reader.get_pointer_element(index).get_data(None))
} else {
None
}
}
}

impl <'a> crate::traits::IntoInternalListReader<'a> for Reader<'a> {
Expand Down Expand Up @@ -121,6 +129,14 @@ impl <'a> Builder<'a> {
assert!(index < self.len());
self.builder.get_pointer_element(index).get_data(None)
}

pub fn try_get(self, index: u32) -> Option<Result<crate::data::Builder<'a>>> {
if index < self.len() {
Some(self.builder.get_pointer_element(index).get_data(None))
} else {
None
}
}
}


Expand Down
18 changes: 18 additions & 0 deletions capnp/src/enum_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ impl <'a, T : FromU16> Reader<'a, T> {
let result: u16 = PrimitiveElement::get(&self.reader, index);
FromU16::from_u16(result)
}

pub fn try_get(&self, index: u32) -> Option<::core::result::Result<T, NotInSchema>> {
if index < self.len() {
let result: u16 = PrimitiveElement::get(&self.reader, index);
Some(FromU16::from_u16(result))
} else {
None
}
}
}

impl <'a, T> crate::traits::IntoInternalListReader<'a> for Reader<'a, T> where T: PrimitiveElement {
Expand Down Expand Up @@ -117,6 +126,15 @@ impl <'a, T : ToU16 + FromU16> Builder<'a, T> {
FromU16::from_u16(result)
}

pub fn try_get(&self, index: u32) -> Option<::core::result::Result<T, NotInSchema>> {
if index < self.len() {
let result: u16 = PrimitiveElement::get_from_builder(&self.builder, index);
Some(FromU16::from_u16(result))
} else {
None
}
}

pub fn reborrow<'b>(&'b self) -> Builder<'b, T> {
Builder { .. *self }
}
Expand Down
16 changes: 16 additions & 0 deletions capnp/src/list_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ impl <'a, T> Reader<'a, T> where T: for<'b> crate::traits::Owned<'b> {
assert!(index < self.len());
FromPointerReader::get_from_pointer(&self.reader.get_pointer_element(index), None)
}

pub fn try_get(self, index: u32) -> Option<Result<<T as crate::traits::Owned<'a>>::Reader>> {
if index < self.len() {
Some(FromPointerReader::get_from_pointer(&self.reader.get_pointer_element(index), None))
} else {
None
}
}
}

impl <'a, T> crate::traits::IntoInternalListReader<'a> for Reader<'a, T> where T: for<'b> crate::traits::Owned<'b> {
Expand Down Expand Up @@ -128,6 +136,14 @@ impl <'a, T> Builder<'a, T> where T: for<'b> crate::traits::Owned<'b> {
FromPointerBuilder::get_from_pointer(self.builder.get_pointer_element(index), None)
}

pub fn try_get(self, index: u32) -> Option<Result<<T as crate::traits::Owned<'a>>::Builder>> {
if index < self.len() {
Some(FromPointerBuilder::get_from_pointer(self.builder.get_pointer_element(index), None))
} else {
None
}
}

pub fn set<'b>(&self, index: u32, value: <T as crate::traits::Owned<'b>>::Reader) -> Result<()>
where <T as crate::traits::Owned<'b>>::Reader: crate::traits::IntoInternalListReader<'b>
{
Expand Down
16 changes: 16 additions & 0 deletions capnp/src/primitive_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ impl <'a, T: PrimitiveElement> Reader<'a, T> {
PrimitiveElement::get(&self.reader, index)
}

pub fn try_get(&self, index: u32) -> Option<T> {
if index < self.len() {
Some(PrimitiveElement::get(&self.reader, index))
} else {
None
}
}

#[cfg(all(target_endian = "little"))]
/// Returns something if the slice is as expected in memory.
pub fn as_slice(&self) -> Option<&[T]> {
Expand Down Expand Up @@ -143,6 +151,14 @@ impl <'a, T : PrimitiveElement> Builder<'a, T> {
PrimitiveElement::get_from_builder(&self.builder, index)
}

pub fn try_get(&self, index: u32) -> Option<T> {
if index < self.len() {
Some(PrimitiveElement::get_from_builder(&self.builder, index))
} else {
None
}
}

pub fn reborrow<'b>(&'b self) -> Builder<'b, T> {
Builder { .. *self }
}
Expand Down
16 changes: 16 additions & 0 deletions capnp/src/struct_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@ impl <'a, T> Reader<'a, T> where T: for<'b> crate::traits::OwnedStruct<'b> {
assert!(index < self.len());
FromStructReader::new(self.reader.get_struct_element(index))
}

pub fn try_get(self, index: u32) -> Option<<T as crate::traits::OwnedStruct<'a>>::Reader> {
if index < self.len() {
Some(FromStructReader::new(self.reader.get_struct_element(index)))
} else {
None
}
}
}

impl <'a, T> crate::traits::IntoInternalListReader<'a> for Reader<'a, T> where T: for<'b> crate::traits::OwnedStruct<'b> {
Expand Down Expand Up @@ -151,6 +159,14 @@ impl <'a, T> Builder<'a, T> where T: for<'b> crate::traits::OwnedStruct<'b> {
assert!(index < self.len());
FromStructBuilder::new(self.builder.get_struct_element(index))
}

pub fn try_get(self, index: u32) -> Option<<T as crate::traits::OwnedStruct<'a>>::Builder> {
if index < self.len() {
Some(FromStructBuilder::new(self.builder.get_struct_element(index)))
} else {
None
}
}
}

impl <'a, T> crate::traits::SetPointerBuilder for Reader<'a, T>
Expand Down
17 changes: 17 additions & 0 deletions capnp/src/text_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ impl <'a> Reader<'a> {
assert!(index < self.len());
self.reader.get_pointer_element(index).get_text(None)
}

pub fn try_get(self, index : u32) -> Option<Result<crate::text::Reader<'a>>> {
if index < self.len() {
Some(self.reader.get_pointer_element(index).get_text(None))
} else {
None
}
}
}

impl <'a> crate::traits::IntoInternalListReader<'a> for Reader<'a> {
Expand Down Expand Up @@ -117,8 +125,17 @@ impl <'a> FromPointerBuilder<'a> for Builder<'a> {

impl <'a> Builder<'a> {
pub fn get(self, index: u32) -> Result<crate::text::Builder<'a>> {
assert!(index < self.len());
Copy link
Member

Choose a reason for hiding this comment

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

good catch!

self.builder.get_pointer_element(index).get_text(None)
}

pub fn try_get(self, index: u32) -> Option<Result<crate::text::Builder<'a>>> {
if index < self.len() {
Some(self.builder.get_pointer_element(index).get_text(None))
} else {
None
}
}
}

impl <'a> crate::traits::SetPointerBuilder for Reader<'a> {
Expand Down