fix clippy hints

feat/vaults
Tomáš Mládek 2021-04-24 00:08:17 +02:00
parent 7420fd45d8
commit 9df88d1ad5
3 changed files with 15 additions and 16 deletions

View File

@ -13,7 +13,7 @@ use uuid::Uuid;
#[derive(Clone, PartialEq)]
pub enum Address {
Hash(Hash),
UUID(Uuid),
Uuid(Uuid),
Attribute(String),
}
@ -27,7 +27,7 @@ impl Address {
pub fn encode(&self) -> Result<Vec<u8>> {
let (hash_func_type, digest) = match self {
Self::Hash(hash) => (KANGAROO_TWELVE, hash.0.clone()),
Self::UUID(uuid) => (IDENTITY, [vec![b'U'], uuid.as_bytes().to_vec()].concat()),
Self::Uuid(uuid) => (IDENTITY, [vec![b'U'], uuid.as_bytes().to_vec()].concat()),
Self::Attribute(attribute) => (IDENTITY, [&[b'A'], attribute.as_bytes()].concat()),
};
@ -55,7 +55,7 @@ impl Address {
IDENTITY => {
let digest_content: Vec<u8> = digest.clone().into_iter().skip(1).collect();
match digest[0] {
b'U' => Ok(Self::UUID(uuid::Uuid::from_slice(
b'U' => Ok(Self::Uuid(uuid::Uuid::from_slice(
digest_content.as_slice(),
)?)),
b'A' => Ok(Self::Attribute(String::from_utf8(digest_content)?)),
@ -91,7 +91,7 @@ impl<'de> Visitor<'de> for AddressVisitor {
E: de::Error,
{
let bytes = decode(str).map_err(de::Error::custom)?;
Ok(Address::decode(bytes.as_ref()).map_err(de::Error::custom)?)
Address::decode(bytes.as_ref()).map_err(de::Error::custom)
}
}
@ -146,7 +146,7 @@ mod tests {
#[test]
fn test_uuid_codec() {
let addr = Address::UUID(Uuid::new_v4());
let addr = Address::Uuid(Uuid::new_v4());
let encoded = addr.encode();
assert!(encoded.is_ok());

View File

@ -346,8 +346,8 @@ pub enum QueryPart {
#[derive(Debug)]
pub enum QueryQualifier {
AND,
OR,
And,
Or,
}
#[derive(Debug)]
@ -495,8 +495,8 @@ impl TryFrom<&lexpr::Value> for Query {
if let Some(queries) = NonEmpty::from_vec(values?) {
Ok(Query::MultiQuery(MultiQuery {
qualifier: match symbol.borrow() {
"and" => QueryQualifier::AND,
_ => QueryQualifier::OR,
"and" => QueryQualifier::And,
_ => QueryQualifier::Or,
},
queries,
}))
@ -598,7 +598,7 @@ impl Query {
0 => Ok(Box::new(true.into_sql::<Bool>())),
1 => Ok(subqueries.remove(0)),
_ => match mq.qualifier {
QueryQualifier::AND => {
QueryQualifier::And => {
let mut result: Box<And<Box<Predicate>, Box<Predicate>>> =
Box::new(And::new(subqueries.remove(0), subqueries.remove(0)));
while !subqueries.is_empty() {
@ -606,7 +606,7 @@ impl Query {
}
Ok(Box::new(result))
}
QueryQualifier::OR => {
QueryQualifier::Or => {
let mut result: Box<Or<Box<Predicate>, Box<Predicate>>> =
Box::new(Or::new(subqueries.remove(0), subqueries.remove(0)));
while !subqueries.is_empty() {

View File

@ -127,10 +127,9 @@ impl std::str::FromStr for UPath {
let result = match string.find(TOP_SEPARATOR) {
Some(head_idx) => {
let (head, rest) = string.split_at(head_idx);
let mut result: Vec<UDirectory> = Vec::new();
result.push(UDirectory {
let mut result: Vec<UDirectory> = vec![UDirectory {
name: String::from(head),
});
}];
result.append(
rest[TOP_SEPARATOR.len()..rest.len()]
.trim_end_matches('/')
@ -316,7 +315,7 @@ pub fn fetch_or_create_dir<C: Connection<Backend = Sqlite>>(
match valid_directories.len() {
0 => {
if create {
let new_directory_address = Address::UUID(Uuid::new_v4());
let new_directory_address = Address::Uuid(Uuid::new_v4());
let type_entry = Entry {
entity: new_directory_address.clone(),
attribute: String::from(IS_OF_TYPE_ATTR),
@ -608,7 +607,7 @@ fn _process_directory_entry<P: AsRef<Path>>(
let _pool = &db_pool.write().unwrap();
let connection = _pool.get()?;
connection.transaction::<_, Error, _>(|| {
let file_address = Address::UUID(Uuid::new_v4());
let file_address = Address::Uuid(Uuid::new_v4());
let type_entry = Entry {
entity: file_address.clone(),
attribute: String::from(IS_OF_TYPE_ATTR),