Merge remote-tracking branch 'origin/main' into ql_gen

This commit is contained in:
Nick Rolfe
2020-10-28 11:41:18 +00:00
3 changed files with 6 additions and 10 deletions

View File

@@ -47,9 +47,7 @@ pub enum Storage {
/// the field is stored as a column in the parent table
Column,
// the field is store in a link table
Table {
index: usize,
},
Table,
}
pub fn read_node_types(node_types_path: &Path) -> std::io::Result<Vec<Entry>> {
@@ -132,9 +130,7 @@ fn add_field(
} else {
// This field can appear zero or multiple times, so put
// it in an auxiliary table.
storage = Storage::Table {
index: fields.len(),
};
storage = Storage::Table;
}
fields.push(Field {
parent: TypeName {