Move errors in own module

This commit is contained in:
Valentin Brandl 2019-04-19 16:01:47 +02:00
parent 1aabff7971
commit bfbd0d5cb0
No known key found for this signature in database
GPG Key ID: 30D341DD34118D7D

View File

@ -1,19 +1,29 @@
#[macro_use] #[macro_use]
extern crate actix_web; extern crate actix_web;
#[macro_use]
extern crate serde_derive;
mod color;
mod error;
use crate::{
color::{ColorKind, ToCode},
error::Error,
};
use actix_web::{ use actix_web::{
error, error::ErrorBadRequest,
http::{ http::{
self, self,
header::{CacheControl, CacheDirective, Expires}, header::{CacheControl, CacheDirective, Expires},
}, },
middleware, web, App, HttpResponse, HttpServer, ResponseError, middleware, web, App, HttpResponse, HttpServer,
}; };
use badge::{Badge, BadgeOptions}; use badge::{Badge, BadgeOptions};
use bytes::Bytes; use bytes::Bytes;
use futures::{unsync::mpsc, Stream}; use futures::{unsync::mpsc, Stream};
use git2::Repository; use git2::Repository;
use std::{ use std::{
convert::TryFrom,
fs::create_dir_all, fs::create_dir_all,
path::{Path, PathBuf}, path::{Path, PathBuf},
process::Command, process::Command,
@ -45,47 +55,9 @@ struct Opt {
host: String, host: String,
} }
#[derive(Debug)] #[derive(Debug, Deserialize)]
enum Error { struct BadgeQuery {
Git(git2::Error), color: Option<String>,
Io(std::io::Error),
Badge(String),
}
impl std::fmt::Display for Error {
fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
Error::Git(e) => write!(fmt, "Git({})", e),
Error::Io(e) => write!(fmt, "Io({})", e),
Error::Badge(s) => write!(fmt, "Badge({})", s),
}
}
}
impl ResponseError for Error {
fn error_response(&self) -> HttpResponse {
HttpResponse::InternalServerError().finish()
}
}
impl std::error::Error for Error {}
impl From<String> for Error {
fn from(s: String) -> Self {
Error::Badge(s)
}
}
impl From<git2::Error> for Error {
fn from(err: git2::Error) -> Self {
Error::Git(err)
}
}
impl From<std::io::Error> for Error {
fn from(err: std::io::Error) -> Self {
Error::Io(err)
}
} }
fn pull(path: impl AsRef<Path>) -> Result<(), Error> { fn pull(path: impl AsRef<Path>) -> Result<(), Error> {