git.delta.rocks / jrsonnet / refs/commits / 12f7f36efab6

difftreelog

feat(evaluator) import resolver as_any method

Лач2020-06-28parent: #af49e24.patch.diff
in: master

1 file changed

modifiedcrates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/import.rs
1use crate::create_error_result;2use crate::{3	create_error,4	error::{Error, Result},5};6use fs::File;7use std::fs;8use std::io::Read;9use std::{cell::RefCell, collections::HashMap, path::PathBuf, rc::Rc};1011pub trait ImportResolver {12	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>>;13	fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>>;14}1516pub struct DummyImportResolver;17impl ImportResolver for DummyImportResolver {18	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {19		create_error_result(Error::ImportNotSupported(from.clone(), path.clone()))20	}21	fn load_file_contents(&self, _resolved: &PathBuf) -> Result<Rc<str>> {22		// Can be only caused by library direct consumer, not by supplied jsonnet23		panic!("dummy resolver can't load any file")24	}25}26impl Default for Box<dyn ImportResolver> {27	fn default() -> Self {28		Box::new(DummyImportResolver)29	}30}3132pub struct FileImportResolver {33	pub library_paths: Vec<PathBuf>,34}35impl ImportResolver for FileImportResolver {36	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {37		let mut new_path = from.clone();38		new_path.push(path);39		if new_path.exists() {40			Ok(Rc::new(new_path))41		} else {42			for library_path in self.library_paths.iter() {43				let mut cloned = library_path.clone();44				cloned.push(path);45				if cloned.exists() {46					return Ok(Rc::new(cloned));47				}48			}49			create_error_result(Error::ImportFileNotFound(from.clone(), path.clone()))50		}51	}52	fn load_file_contents(&self, id: &PathBuf) -> Result<Rc<str>> {53		let mut file =54			File::open(id).map_err(|_e| create_error(Error::ResolvedFileNotFound(id.clone())))?;55		let mut out = String::new();56		file.read_to_string(&mut out)57			.map_err(|_e| create_error(Error::ImportBadFileUtf8(id.clone())))?;58		Ok(out.into())59	}60}6162type ResolutionData = (PathBuf, PathBuf);63pub struct CachingImportResolver {64	resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,65	loading_cache: RefCell<HashMap<PathBuf, Result<Rc<str>>>>,66	inner: Box<dyn ImportResolver>,67}68impl ImportResolver for CachingImportResolver {69	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {70		self.resolution_cache71			.borrow_mut()72			.entry((from.clone(), path.clone()))73			.or_insert_with(|| self.inner.resolve_file(from, path))74			.clone()75	}76	fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>> {77		self.loading_cache78			.borrow_mut()79			.entry(resolved.clone())80			.or_insert_with(|| self.inner.load_file_contents(resolved))81			.clone()82	}83}
after · crates/jrsonnet-evaluator/src/import.rs
1use crate::create_error_result;2use crate::{3	create_error,4	error::{Error, Result},5};6use fs::File;7use std::fs;8use std::io::Read;9use std::{any::Any, cell::RefCell, collections::HashMap, path::PathBuf, rc::Rc};1011pub trait ImportResolver {12	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>>;13	fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>>;14	unsafe fn as_any(&self) -> &dyn Any;15}1617pub struct DummyImportResolver;18impl ImportResolver for DummyImportResolver {19	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {20		create_error_result(Error::ImportNotSupported(from.clone(), path.clone()))21	}22	fn load_file_contents(&self, _resolved: &PathBuf) -> Result<Rc<str>> {23		// Can be only caused by library direct consumer, not by supplied jsonnet24		panic!("dummy resolver can't load any file")25	}26	unsafe fn as_any(&self) -> &dyn Any {27		panic!("this resolver can't be used as any")28	}29}30impl Default for Box<dyn ImportResolver> {31	fn default() -> Self {32		Box::new(DummyImportResolver)33	}34}3536pub struct FileImportResolver {37	pub library_paths: Vec<PathBuf>,38}39impl ImportResolver for FileImportResolver {40	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {41		let mut new_path = from.clone();42		new_path.push(path);43		if new_path.exists() {44			Ok(Rc::new(new_path))45		} else {46			for library_path in self.library_paths.iter() {47				let mut cloned = library_path.clone();48				cloned.push(path);49				if cloned.exists() {50					return Ok(Rc::new(cloned));51				}52			}53			create_error_result(Error::ImportFileNotFound(from.clone(), path.clone()))54		}55	}56	fn load_file_contents(&self, id: &PathBuf) -> Result<Rc<str>> {57		let mut file =58			File::open(id).map_err(|_e| create_error(Error::ResolvedFileNotFound(id.clone())))?;59		let mut out = String::new();60		file.read_to_string(&mut out)61			.map_err(|_e| create_error(Error::ImportBadFileUtf8(id.clone())))?;62		Ok(out.into())63	}64	unsafe fn as_any(&self) -> &dyn Any {65		panic!("this resolver can't be used as any")66	}67}6869type ResolutionData = (PathBuf, PathBuf);70pub struct CachingImportResolver {71	resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,72	loading_cache: RefCell<HashMap<PathBuf, Result<Rc<str>>>>,73	inner: Box<dyn ImportResolver>,74}75impl ImportResolver for CachingImportResolver {76	fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {77		self.resolution_cache78			.borrow_mut()79			.entry((from.clone(), path.clone()))80			.or_insert_with(|| self.inner.resolve_file(from, path))81			.clone()82	}83	fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>> {84		self.loading_cache85			.borrow_mut()86			.entry(resolved.clone())87			.or_insert_with(|| self.inner.load_file_contents(resolved))88			.clone()89	}90	unsafe fn as_any(&self) -> &dyn Any {91		panic!("this resolver can't be used as any")92	}93}