Rewrite Project, remove SourceProject (#274)

* Rewrite project file to have relative paths and drop SourceProject

* Redo project error types

* Tidy up and document Project type

* Strip out init command
This commit is contained in:
Lucien Greathouse 2019-12-12 14:45:15 -08:00 • committed by GitHub
parent 47c7f63d75
commit 1f7f2b22e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 233 additions and 539 deletions

View file

@ -8,7 +8,7 @@ use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
use crate::{
cli::ServeCommand,
project::ProjectLoadError,
project::ProjectError,
serve_session::ServeSession,
vfs::{RealFetcher, Vfs, WatchMode},
web::LiveServer,
@ -19,11 +19,11 @@ const DEFAULT_PORT: u16 = 34872;
#[derive(Debug, Fail)]
pub enum ServeError {
#[fail(display = "Couldn't load project: {}", _0)]
ProjectLoad(#[fail(cause)] ProjectLoadError),
ProjectError(#[fail(cause)] ProjectError),
}
impl_from!(ServeError {
ProjectLoadError => ProjectLoad,
ProjectError => ProjectError,
});
pub fn serve(options: ServeCommand) -> Result<(), ServeError> {