thm
/
upend
1
0
Fork 0
Code Issues 73 Pull Requests Packages Projects Releases 5 Wiki Activity

run `cargo update`, fix incorrect imports

feat/vaults
Tomáš Mládek 2021-02-18 19:20:52 +01:00
parent 22dd315c47
commit db5235bbd5
4 changed files with 515 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

874
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
src/addressing.rs
View File

@ -7,9 +7,8 @@ use unsigned_varint::encode;
use uuid::Uuid; use uuid::Uuid;
use crate::hash::{encode, Hash}; use crate::hash::{encode, Hash};
use serde::export::Formatter;
use thiserror::private::DisplayAsDisplay;
use std::str::FromStr; use std::str::FromStr;
use thiserror::private::DisplayAsDisplay;
#[derive(Clone, PartialEq)] #[derive(Clone, PartialEq)]
pub enum Address { pub enum Address {
@ -73,7 +72,7 @@ impl std::fmt::Display for Address {
} }
impl std::fmt::Debug for Address { impl std::fmt::Debug for Address {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.as_display()) write!(f, "{}", self.as_display())
} }
} }

5
src/database.rs
View File

@ -14,7 +14,6 @@ use lexpr::value::Value::Symbol;
use lexpr::Value::Cons; use lexpr::Value::Cons;
use log::{debug, trace}; use log::{debug, trace};
use nonempty::NonEmpty; use nonempty::NonEmpty;
use serde::export::Formatter;
use serde_json::json; use serde_json::json;
use std::borrow::Borrow; use std::borrow::Borrow;
use std::convert::TryFrom; use std::convert::TryFrom;
@ -74,7 +73,7 @@ impl TryFrom<models::Entry> for Entry {
} }
impl std::fmt::Display for InnerEntry { impl std::fmt::Display for InnerEntry {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{} | {} | {}", self.target, self.key, self.value) write!(f, "{} | {} | {}", self.target, self.key, self.value)
} }
} }
@ -103,7 +102,7 @@ impl EntryValue {
// unsafe unwraps! // unsafe unwraps!
impl std::fmt::Display for EntryValue { impl std::fmt::Display for EntryValue {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let (entry_type, entry_value) = match self { let (entry_type, entry_value) = match self {
EntryValue::Address(address) => ("ADDRESS", address.to_string()), EntryValue::Address(address) => ("ADDRESS", address.to_string()),
EntryValue::Value(value) => ("VALUE", serde_json::to_string(value).unwrap()), EntryValue::Value(value) => ("VALUE", serde_json::to_string(value).unwrap()),

5
src/filesystem.rs
View File

@ -13,7 +13,6 @@ use diesel::sqlite::Sqlite;
use diesel::Connection; use diesel::Connection;
use log::{error, info, trace}; use log::{error, info, trace};
use rayon::prelude::*; use rayon::prelude::*;
use serde::export::Formatter;
use serde_json::Value; use serde_json::Value;
use std::path::{Component, Path, PathBuf}; use std::path::{Component, Path, PathBuf};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
@ -86,13 +85,13 @@ impl std::str::FromStr for UPath {
} }
impl std::fmt::Display for UDirectory { impl std::fmt::Display for UDirectory {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.name) write!(f, "{}", self.name)
} }
} }
impl std::fmt::Display for UPath { impl std::fmt::Display for UPath {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self.0.len() { match self.0.len() {
0 => write!(f, ""), 0 => write!(f, ""),
1 => write!(f, "{}", self.0.first().unwrap().name), 1 => write!(f, "{}", self.0.first().unwrap().name),