git.delta.rocks / jrsonnet / refs/commits / 06fa714fdb66

--- a/bindings/jsonnet/src/import.rs
+++ b/bindings/jsonnet/src/import.rs
@@ -143,7 +143,7 @@
 pub unsafe extern "C" fn jsonnet_jpath_add(vm: &State, v: *const c_char) {
 	let cstr = CStr::from_ptr(v);
 	let path = PathBuf::from(cstr.to_str().unwrap());
-	let any_resolver = &vm.settings().import_resolver;
+	let any_resolver = vm.import_resolver();
 	let resolver = any_resolver
 		.as_any()
 		.downcast_ref::<NativeImportResolver>()

5353
54impl<T: ?Sized> Borrow<T> for TraceBox<T> {54impl<T: ?Sized> Borrow<T> for TraceBox<T> {
55	fn borrow(&self) -> &T {55	fn borrow(&self) -> &T {
56		&*self.056		&self.0
57	}57	}
58}58}
5959
60impl<T: ?Sized> BorrowMut<T> for TraceBox<T> {60impl<T: ?Sized> BorrowMut<T> for TraceBox<T> {
61	fn borrow_mut(&mut self) -> &mut T {61	fn borrow_mut(&mut self) -> &mut T {
62		&mut *self.062		&mut self.0
63	}63	}
64}64}
6565
66impl<T: ?Sized> AsRef<T> for TraceBox<T> {66impl<T: ?Sized> AsRef<T> for TraceBox<T> {
67	fn as_ref(&self) -> &T {67	fn as_ref(&self) -> &T {
68		&*self.068		&self.0
69	}69	}
70}70}
7171
72impl<T: ?Sized> AsMut<T> for TraceBox<T> {72impl<T: ?Sized> AsMut<T> for TraceBox<T> {
73	fn as_mut(&mut self) -> &mut T {73	fn as_mut(&mut self) -> &mut T {
74		&mut *self.074		&mut self.0
75	}75	}
76}76}
7777

--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -41,7 +41,7 @@
 	}
 
 	unsafe fn as_any(&self) -> &dyn Any {
-		panic!("`as_any($self)` is not supported by dummy resolver")
+		panic!("`as_any(&self)` is not supported by dummy resolver")
 	}
 }
 #[allow(clippy::use_self)]

--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -774,10 +774,7 @@
 			format_arr(s.clone(), "%+-4o", &[Val::Num(8.0)]).unwrap(),
 			"+10 "
 		);
-		assert_eq!(
-			format_arr(s.clone(), "%+-04o", &[Val::Num(8.0)]).unwrap(),
-			"+10 "
-		);
+		assert_eq!(format_arr(s, "%+-04o", &[Val::Num(8.0)]).unwrap(), "+10 ");
 	}
 
 	#[test]

--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -393,6 +393,7 @@
 	($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty) => {Either6<$a, $b, $c, $d, $e, $f>};
 	($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty, $g:ty) => {Either7<$a, $b, $c, $d, $e, $f, $g>};
 }
+pub use Either;
 
 pub type MyType = Either![u32, f64, String];