`a5bf8061bf53`

2 files changed

modifiedcrates/jrsonnet-evaluator/src/lib.rsdiff before after both

387		let resolved = self.resolve_from(from, path)?;387		let resolved = self.resolve_from(from, path)?;
388		self.import_resolved(resolved)388		self.import_resolved(resolved)
389	}389	}
390	pub fn import(&self, path: &impl AsRef<Path>) -> Result<Val> {390	pub fn import(&self, path: impl AsRef<Path>) -> Result<Val> {
391		let resolved = self.resolve(path)?;391		let resolved = self.resolve(path)?;
392		self.import_resolved(resolved)392		self.import_resolved(resolved)
393	}393	}
620620
621	// Only panics in case of [`ImportResolver`] contract violation621	// Only panics in case of [`ImportResolver`] contract violation
622	#[allow(clippy::missing_panics_doc)]622	#[allow(clippy::missing_panics_doc)]
623	pub fn resolve(&self, path: &impl AsRef<Path>) -> Result<SourcePath> {623	pub fn resolve(&self, path: impl AsRef<Path>) -> Result<SourcePath> {
624		self.import_resolver().resolve(path.as_ref())624		self.import_resolver().resolve(path.as_ref())
625	}625	}
626	pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {626	pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {

modifiedcrates/jrsonnet-parser/src/lib.rsdiff before after both

360360
361#[cfg(test)]361#[cfg(test)]
362pub mod tests {362pub mod tests {
363	use std::borrow::Cow;
364
365	use jrsonnet_interner::IStr;363	use jrsonnet_interner::IStr;
366	use BinaryOpType::*;364	use BinaryOpType::*;
373			parse(371			parse(
374				$s,372				$s,
375				&ParserSettings {373				&ParserSettings {
376					file_name: Source::new_virtual(Cow::Borrowed("<test>"), IStr::empty()),374					file_name: Source::new_virtual("<test>".into(), IStr::empty()),
377				},375				},
378			)376			)
379			.unwrap()377			.unwrap()
385			LocExpr(383			LocExpr(
386				std::rc::Rc::new($expr),384				std::rc::Rc::new($expr),
387				ExprLocation(385				ExprLocation(
388					Source::new_virtual(Cow::Borrowed("<test>"), IStr::empty()),386					Source::new_virtual("<test>".into(), IStr::empty()),
389					$from,387					$from,
390					$to,388					$to,
391				),389				),
721	fn add_location_info_to_all_sub_expressions() {719	fn add_location_info_to_all_sub_expressions() {
722		use Expr::*;720		use Expr::*;
723721
724		let file_name = Source::new_virtual(Cow::Borrowed("<test>"), IStr::empty());722		let file_name = Source::new_virtual("<test>".into(), IStr::empty());
725		let expr = parse(723		let expr = parse(
726			"{} { local x = 1, x: x } + {}",724			"{} { local x = 1, x: x } + {}",
727			&ParserSettings { file_name },725			&ParserSettings { file_name },