Skip to content

Change list get methods to return an Option<T> #284

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

Closed
wants to merge 1 commit into from
Closed

Change list get methods to return an Option<T> #284

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
13 changes: 10 additions & 3 deletions capnp/src/primitive_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,20 @@ impl <'a, T: PrimitiveElement> FromPointerReader<'a> for Reader<'a, T> {

impl <'a, T: PrimitiveElement> IndexMove<u32, T> for Reader<'a, T>{
fn index_move(&self, index: u32) -> T {
self.get(index)
self.get(index).unwrap()
}
}

impl <'a, T: PrimitiveElement> Reader<'a, T> {
pub fn get(&self, index: u32) -> T {
assert!(index < self.len());
pub fn get(&self, index: u32) -> Option<T> {
if index < self.len() {
Some(PrimitiveElement::get(&self.reader, index))
} else {
None
}
}

pub unsafe fn get_unchecked(&self, index: u32) -> T {
PrimitiveElement::get(&self.reader, index)
}

Expand Down
21 changes: 11 additions & 10 deletions capnp/src/private/layout_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,17 @@ fn bool_list() {
let reader = crate::primitive_list::Reader::<bool>::get_from_pointer(&pointer_reader, None).unwrap();

assert_eq!(reader.len(), 10);
assert_eq!(reader.get(0), true);
assert_eq!(reader.get(1), false);
assert_eq!(reader.get(2), true);
assert_eq!(reader.get(3), false);
assert_eq!(reader.get(4), true);
assert_eq!(reader.get(5), true);
assert_eq!(reader.get(6), true);
assert_eq!(reader.get(7), false);
assert_eq!(reader.get(8), false);
assert_eq!(reader.get(9), true);
assert_eq!(reader.get(0), Some(true));
assert_eq!(reader.get(1), Some(false));
assert_eq!(reader.get(2), Some(true));
assert_eq!(reader.get(3), Some(false));
assert_eq!(reader.get(4), Some(true));
assert_eq!(reader.get(5), Some(true));
assert_eq!(reader.get(6), Some(true));
assert_eq!(reader.get(7), Some(false));
assert_eq!(reader.get(8), Some(false));
assert_eq!(reader.get(9), Some(true));
assert_eq!(reader.get(10), None);
}
}

Expand Down
13 changes: 10 additions & 3 deletions capnp/src/struct_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,20 @@ impl <'a, T> FromPointerReader<'a> for Reader<'a, T> where T: for<'b> crate::tra
impl <'a, T> IndexMove<u32, <T as crate::traits::OwnedStruct<'a>>::Reader> for Reader<'a, T>
where T: for<'b> crate::traits::OwnedStruct<'b> {
fn index_move(&self, index: u32) -> <T as crate::traits::OwnedStruct<'a>>::Reader {
self.get(index)
self.get(index).unwrap()
}
}

impl <'a, T> Reader<'a, T> where T: for<'b> crate::traits::OwnedStruct<'b> {
pub fn get(self, index: u32) -> <T as crate::traits::OwnedStruct<'a>>::Reader {
assert!(index < self.len());
pub fn 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
}
}

pub unsafe fn get_unchecked(self, index: u32) -> <T as crate::traits::OwnedStruct<'a>>::Reader {
FromStructReader::new(self.reader.get_struct_element(index))
}
}
Expand Down
16 changes: 8 additions & 8 deletions capnpc/src/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,8 @@ fn get_params(gen: &GeneratorContext,
let node = gen.node_map[&node_id];
let parameters = node.get_parameters()?;

for idx in 0 .. parameters.len() {
result.push(parameters.get(parameters.len() - 1 - idx).get_name()?.into());
for idx in (0 .. parameters.len()).rev() {
result.push(unsafe { parameters.get_unchecked(idx) }.get_name()?.into());
}

node_id = node.get_scope_id();
Expand Down Expand Up @@ -1020,7 +1020,7 @@ fn used_params_of_type(gen: &GeneratorContext,
type_::any_pointer::Parameter(def) => {
let the_struct = &gen.node_map[&def.get_scope_id()];
let parameters = the_struct.get_parameters()?;
let parameter = parameters.get(def.get_parameter_index() as u32);
let parameter = parameters.get(def.get_parameter_index() as u32).unwrap();
let parameter_name = parameter.get_name()?;
used_params.insert(parameter_name.to_string());
}
Expand Down Expand Up @@ -1313,7 +1313,7 @@ fn get_ty_params_of_brand(gen: &GeneratorContext,
let mut result = String::new();
for (scope_id, parameter_index) in acc.into_iter() {
let node = gen.node_map[&scope_id];
let p = node.get_parameters()?.get(parameter_index as u32);
let p = node.get_parameters()?.get(parameter_index as u32).unwrap();
result.push_str(p.get_name()?);
result.push_str(",");
}
Expand Down Expand Up @@ -1762,7 +1762,7 @@ fn generate_node(gen: &GeneratorContext,
let mut match_branches = Vec::new();
let enumerants = enum_reader.get_enumerants()?;
for ii in 0..enumerants.len() {
let enumerant = capitalize_first_letter(get_enumerant_name(enumerants.get(ii))?);
let enumerant = capitalize_first_letter(get_enumerant_name(unsafe { enumerants.get_unchecked(ii) })?);
members.push(Line(format!("{} = {},", enumerant, ii)));
match_branches.push(
Line(format!("{} => ::core::result::Result::Ok({}::{}),", ii, last_name, enumerant)));
Expand Down Expand Up @@ -1829,7 +1829,7 @@ fn generate_node(gen: &GeneratorContext,

let methods = interface.get_methods()?;
for ordinal in 0..methods.len() {
let method = methods.get(ordinal);
let method = unsafe { methods.get_unchecked(ordinal) };
let name = method.get_name()?;

method.get_code_order();
Expand Down Expand Up @@ -1907,7 +1907,7 @@ fn generate_node(gen: &GeneratorContext,
) -> ::capnp::Result<()>{
let extends = interface.get_superclasses()?;
for ii in 0..extends.len() {
let superclass = extends.get(ii);
let superclass = unsafe { extends.get_unchecked(ii) };
if let node::Interface(interface) = gen.node_map[&superclass.get_id()].which()? {
find_super_interfaces(interface, all_extends, gen)?;
}
Expand Down Expand Up @@ -2159,7 +2159,7 @@ fn generate_node(gen: &GeneratorContext,
let enumerants = e.get_enumerants()?;
if (v as u32) < enumerants.len() {
let variant =
capitalize_first_letter(get_enumerant_name(enumerants.get(v as u32))?);
capitalize_first_letter(get_enumerant_name(unsafe { enumerants.get_unchecked(v as u32) })?);
let type_string = typ.type_string(gen, Leaf::Owned)?;
Line(format!("pub const {}: {} = {}::{};",
styled_name,
Expand Down
2 changes: 1 addition & 1 deletion capnpc/src/codegen_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ impl <'a> RustTypeInfo for type_::Reader<'a> {
type_::any_pointer::Parameter(def) => {
let the_struct = &gen.node_map[&def.get_scope_id()];
let parameters = the_struct.get_parameters()?;
let parameter = parameters.get(def.get_parameter_index() as u32);
let parameter = parameters.get(def.get_parameter_index() as u32).unwrap();
let parameter_name = parameter.get_name()?;
match module {
Leaf::Owned => Ok(parameter_name.to_string()),
Expand Down