Merge branch 'update-deps' into 'dev'

Update deps

See merge request memri/pod!163

Cargo.toml

@@ -13,25 +13,23 @@ publish = false # Prevent accidental publishing
 
 [dependencies]
 bytes = "0.5.6"
-chacha20poly1305 = "0.5.1"
-chrono = { version = "0.4.13", features = ["serde"] }
+chacha20poly1305 = "0.6.0"
+chrono = { version = "0.4.19", features = ["serde"] }
 env_logger = "0.7.1"
 hex = "0.4.2"
 lazy_static = "1.4.0"
-libc = "0.2.74"
+libc = "0.2.79"
 log = "0.4.11"
-r2d2 = "0.8.9"
-r2d2_sqlite = "0.16.0"
 rand = "0.7.3"
 refinery = { version = "0.3.0", features = ["rusqlite"] }
 regex = "1.3.9"
-rusqlite = { version = "0.23.1", features = ["sqlcipher"] }
-serde = { version = "1.0.114", features = ["derive"] }
-serde_json = "1.0.57"
+rusqlite = { features = ["sqlcipher"] }
+serde = { version = "1.0.116", features = ["derive"] }
+serde_json = "1.0.58"
 sha2 = "0.9.1"
-structopt = { version = "0.3.15", features = ["color"] }
+structopt = { version = "0.3.18", features = ["color"] }
 tokio = { version = "0.2.22", features = ["macros"] }
-warp = { version = "0.2.4", default-features = false, features = ["tls"] }
+warp = { version = "0.2.5", default-features = false, features = ["tls"] }
 
 [dev-dependencies]
 criterion = "0.3.3"

src/error.rs

@@ -35,16 +35,6 @@ impl From<hex::FromHexError> for Error {
     }
 }
 
-impl From<r2d2::Error> for Error {
-    fn from(err: r2d2::Error) -> Error {
-        let msg = format!("Database r2d2 error {}", err);
-        Error {
-            code: StatusCode::INTERNAL_SERVER_ERROR,
-            msg,
-        }
-    }
-}
-
 impl From<refinery::Error> for Error {
     fn from(err: refinery::Error) -> Error {
         let msg = format!("Database 'refinery' migration error, {}", err);

src/main.rs

-extern crate r2d2;
-extern crate r2d2_sqlite;
 extern crate rusqlite;
 
 mod api_model;