Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions tasks/ast_tools/src/generators/raw_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -811,12 +811,12 @@ impl Replacer for PosOffsetReplacer<'_, '_> {

let mut field_names = caps.get(2).unwrap().as_str().split('.');
let field_name = field_names.next().unwrap();
let field = struct_def.fields.iter().find(|field| field.name() == field_name).unwrap();
let field = struct_def.field_by_name(field_name);
let mut offset = self.struct_offset + field.offset_64();
let mut type_def = field.type_def(self.schema);
for field_name in field_names {
let struct_def = type_def.as_struct().unwrap();
let field = struct_def.fields.iter().find(|field| field.name() == field_name).unwrap();
let field = struct_def.field_by_name(field_name);
offset += field.offset_64();
type_def = field.type_def(self.schema);
}
Expand Down
8 changes: 8 additions & 0 deletions tasks/ast_tools/src/schema/defs/struct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ impl StructDef {
pub fn field_indices(&self) -> Range<usize> {
0..self.fields.len()
}

/// Get reference to [`FieldDef`] for field called `name`.
///
/// # Panics
/// Panics if struct does not have a field called `name`.
pub fn field_by_name(&self, name: &str) -> &FieldDef {
self.fields.iter().find(|field| field.name() == name).unwrap()
}
}

impl Def for StructDef {
Expand Down
Loading