git.delta.rocks / jrsonnet / refs/commits / a5bf8061bf53

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> {

--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -360,8 +360,6 @@
 
 #[cfg(test)]
 pub mod tests {
-	use std::borrow::Cow;
-
 	use jrsonnet_interner::IStr;
 	use BinaryOpType::*;
 
@@ -373,7 +371,7 @@
 			parse(
 				$s,
 				&ParserSettings {
-					file_name: Source::new_virtual(Cow::Borrowed("<test>"), IStr::empty()),
+					file_name: Source::new_virtual("<test>".into(), IStr::empty()),
 				},
 			)
 			.unwrap()
@@ -385,7 +383,7 @@
 			LocExpr(
 				std::rc::Rc::new($expr),
 				ExprLocation(
-					Source::new_virtual(Cow::Borrowed("<test>"), IStr::empty()),
+					Source::new_virtual("<test>".into(), IStr::empty()),
 					$from,
 					$to,
 				),
@@ -721,7 +719,7 @@
 	fn add_location_info_to_all_sub_expressions() {
 		use Expr::*;
 
-		let file_name = Source::new_virtual(Cow::Borrowed("<test>"), IStr::empty());
+		let file_name = Source::new_virtual("<test>".into(), IStr::empty());
 		let expr = parse(
 			"{} { local x = 1, x: x } + {}",
 			&ParserSettings { file_name },