actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-01-23 06:14:35 +01:00
Code Issues Releases Wiki Activity

Merge pull request #281 from JohnTitor/diesel-uuid

Browse Source 
Fix simple-auth-server compilation
This commit is contained in:
Yuki Okushi 2020-03-28 12:35:33 +09:00 committed by GitHub
commit 92c9dd4c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simple-auth-server/Cargo.toml
View File

@ -12,7 +12,7 @@ actix-rt = "1.0.0"
argonautica = "0.2.0" argonautica = "0.2.0"
chrono = { version = "0.4.6", features = ["serde"] } chrono = { version = "0.4.6", features = ["serde"] }
derive_more = "0.99.0" derive_more = "0.99.0"
diesel = { version = "1.4.2", features = ["postgres","uuidv07", "r2d2", "chrono"] } diesel = { version = "1.4.2", features = ["postgres", "uuidv07", "r2d2", "chrono"] }
dotenv = "0.14.1" dotenv = "0.14.1"
env_logger = "0.6" env_logger = "0.6"
futures = "0.3.1" futures = "0.3.1"
@ -21,4 +21,4 @@ lazy_static = "1.3.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
sparkpost = "0.5.2" sparkpost = "0.5.2"
uuid = { version = "0.7", features = ["serde", "v4"] } uuid = { version = "0.8", features = ["serde", "v4"] }

2
simple-auth-server/src/errors.rs
View File

@ -2,7 +2,7 @@ use actix_web::{error::ResponseError, HttpResponse};
use derive_more::Display; use derive_more::Display;
use diesel::result::{DatabaseErrorKind, Error as DBError}; use diesel::result::{DatabaseErrorKind, Error as DBError};
use std::convert::From; use std::convert::From;
use uuid::parser::ParseError; use uuid::Error as ParseError;
#[derive(Debug, Display)] #[derive(Debug, Display)]
pub enum ServiceError { pub enum ServiceError {