run `cargo update`, fix incorrect imports

src/addressing.rs

@@ -7,9 +7,8 @@ use unsigned_varint::encode;
 use uuid::Uuid;
 
 use crate::hash::{encode, Hash};
-use serde::export::Formatter;
-use thiserror::private::DisplayAsDisplay;
 use std::str::FromStr;
+use thiserror::private::DisplayAsDisplay;
 
 #[derive(Clone, PartialEq)]
 pub enum Address {
@@ -73,7 +72,7 @@ impl std::fmt::Display 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())
     }
 }

src/database.rs

@@ -14,7 +14,6 @@ use lexpr::value::Value::Symbol;
 use lexpr::Value::Cons;
 use log::{debug, trace};
 use nonempty::NonEmpty;
-use serde::export::Formatter;
 use serde_json::json;
 use std::borrow::Borrow;
 use std::convert::TryFrom;
@@ -74,7 +73,7 @@ impl TryFrom<models::Entry> for Entry {
 }
 
 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)
     }
 }
@@ -103,7 +102,7 @@ impl EntryValue {
 
 // unsafe unwraps!
 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 {
             EntryValue::Address(address) => ("ADDRESS", address.to_string()),
             EntryValue::Value(value) => ("VALUE", serde_json::to_string(value).unwrap()),

src/filesystem.rs

@@ -13,7 +13,6 @@ use diesel::sqlite::Sqlite;
 use diesel::Connection;
 use log::{error, info, trace};
 use rayon::prelude::*;
-use serde::export::Formatter;
 use serde_json::Value;
 use std::path::{Component, Path, PathBuf};
 use std::sync::{Arc, RwLock};
@@ -86,13 +85,13 @@ impl std::str::FromStr for UPath {
 }
 
 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)
     }
 }
 
 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() {
             0 => write!(f, ""),
             1 => write!(f, "{}", self.0.first().unwrap().name),