move "?" out of upend macros
parent
ba3aa330bd
commit
a2b9ec4c75
|
@ -269,8 +269,8 @@ pub fn resolve_path_cached(
|
||||||
|
|
||||||
pub fn initialize_hier(connection: &UpEndConnection) -> Result<()> {
|
pub fn initialize_hier(connection: &UpEndConnection) -> Result<()> {
|
||||||
connection.insert_entry(Entry::try_from(&*HIER_INVARIANT)?)?;
|
connection.insert_entry(Entry::try_from(&*HIER_INVARIANT)?)?;
|
||||||
upend_insert_addr!(connection, HIER_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR);
|
upend_insert_addr!(connection, HIER_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR)?;
|
||||||
upend_insert_val!(connection, HIER_ADDR, TYPE_HAS_ATTR, HIER_HAS_ATTR);
|
upend_insert_val!(connection, HIER_ADDR, TYPE_HAS_ATTR, HIER_HAS_ATTR)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ macro_rules! upend_insert_val {
|
||||||
attribute: String::from($attribute),
|
attribute: String::from($attribute),
|
||||||
value: crate::database::entry::EntryValue::Value(serde_json::Value::from($value)),
|
value: crate::database::entry::EntryValue::Value(serde_json::Value::from($value)),
|
||||||
},
|
},
|
||||||
)?;
|
)
|
||||||
}};
|
}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,6 +18,6 @@ macro_rules! upend_insert_addr {
|
||||||
attribute: String::from($attribute),
|
attribute: String::from($attribute),
|
||||||
value: crate::database::entry::EntryValue::Address($addr.clone()),
|
value: crate::database::entry::EntryValue::Address($addr.clone()),
|
||||||
},
|
},
|
||||||
)?;
|
)
|
||||||
}};
|
}};
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,8 +140,8 @@ impl UpEndDatabase {
|
||||||
|
|
||||||
trace!("Initializing types...");
|
trace!("Initializing types...");
|
||||||
connection.insert_entry(Entry::try_from(&*TYPE_INVARIANT)?)?;
|
connection.insert_entry(Entry::try_from(&*TYPE_INVARIANT)?)?;
|
||||||
upend_insert_addr!(connection, TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR);
|
upend_insert_addr!(connection, TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR)?;
|
||||||
upend_insert_val!(connection, TYPE_ADDR, TYPE_HAS_ATTR, TYPE_HAS_ATTR);
|
upend_insert_val!(connection, TYPE_ADDR, TYPE_HAS_ATTR, TYPE_HAS_ATTR)?;
|
||||||
|
|
||||||
initialize_hier(&connection)?;
|
initialize_hier(&connection)?;
|
||||||
|
|
||||||
|
|
|
@ -40,10 +40,10 @@ lazy_static! {
|
||||||
fn initialize_types(connection: &UpEndConnection) -> Result<()> {
|
fn initialize_types(connection: &UpEndConnection) -> Result<()> {
|
||||||
// BLOB_TYPE
|
// BLOB_TYPE
|
||||||
connection.insert_entry(Entry::try_from(&*BLOB_TYPE_INVARIANT)?)?;
|
connection.insert_entry(Entry::try_from(&*BLOB_TYPE_INVARIANT)?)?;
|
||||||
upend_insert_addr!(connection, BLOB_TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR);
|
upend_insert_addr!(connection, BLOB_TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR)?;
|
||||||
upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MTIME_KEY);
|
upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MTIME_KEY)?;
|
||||||
upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_SIZE_KEY);
|
upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_SIZE_KEY)?;
|
||||||
upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MIME_KEY);
|
upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MIME_KEY)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue