From d4fc7a8940c73f2397db414b968a3eef1c277572 Mon Sep 17 00:00:00 2001 From: Лач Date: Sat, 06 Jun 2020 08:00:05 +0000 Subject: [PATCH] feat(evaluator): specify error type --- --- a/crates/jsonnet-evaluator/src/lib.rs +++ b/crates/jsonnet-evaluator/src/lib.rs @@ -63,11 +63,7 @@ #[derive(Default, Clone)] pub struct EvaluationState(Rc); impl EvaluationState { - pub fn add_file( - &self, - name: PathBuf, - code: String, - ) -> std::result::Result<(), Box> { + pub fn add_file(&self, name: PathBuf, code: String) -> std::result::Result<(), ParseError> { self.0.files.borrow_mut().insert( name.clone(), FileData( @@ -90,7 +86,7 @@ name: PathBuf, code: String, parsed: LocExpr, - ) -> std::result::Result<(), Box> { + ) -> std::result::Result<(), ()> { self.0 .files .borrow_mut() @@ -100,9 +96,7 @@ } pub fn get_source(&self, name: &PathBuf) -> Option { let ro_map = self.0.files.borrow(); - ro_map - .get(name) - .map(|value|value.0.clone()) + ro_map.get(name).map(|value| value.0.clone()) } pub fn evaluate_file(&self, name: &PathBuf) -> Result { self.begin_state(); -- gitstuff