From 06fa714fdb662af117f39125582c77a5e8f07009 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sat, 23 Jul 2022 22:26:05 +0000 Subject: [PATCH] style: apply clippy suggestions --- --- 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::() --- a/crates/jrsonnet-evaluator/src/gc.rs +++ b/crates/jrsonnet-evaluator/src/gc.rs @@ -53,25 +53,25 @@ impl Borrow for TraceBox { fn borrow(&self) -> &T { - &*self.0 + &self.0 } } impl BorrowMut for TraceBox { fn borrow_mut(&mut self) -> &mut T { - &mut *self.0 + &mut self.0 } } impl AsRef for TraceBox { fn as_ref(&self) -> &T { - &*self.0 + &self.0 } } impl AsMut for TraceBox { fn as_mut(&mut self) -> &mut T { - &mut *self.0 + &mut self.0 } } --- 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]; -- gitstuff