difftreelog
style fix clippy warnings
in: master
3 files changed
crates/jrsonnet-evaluator/src/gc.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/gc.rs
+++ b/crates/jrsonnet-evaluator/src/gc.rs
@@ -18,7 +18,7 @@
}
fn is_type_tracked() -> bool {
- return true;
+ true
}
}
@@ -101,6 +101,11 @@
&mut self.0
}
}
+impl<V> Default for GcHashSet<V> {
+ fn default() -> Self {
+ Self::new()
+ }
+}
#[derive(Clone)]
pub struct GcHashMap<K, V>(pub FxHashMap<K, V>);
@@ -139,3 +144,8 @@
&mut self.0
}
}
+impl<K, V> Default for GcHashMap<K, V> {
+ fn default() -> Self {
+ Self::new()
+ }
+}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -125,6 +125,7 @@
evaluated: Option<Val>,
}
+#[allow(clippy::type_complexity)]
pub struct Breakpoint {
loc: ExprLocation,
collected: RefCell<HashMap<usize, (usize, Vec<Result<Val>>)>>,
@@ -254,7 +255,7 @@
ro_map.get(name).map(|value| value.source_code.clone())
}
pub fn map_source_locations(&self, file: &Path, locs: &[usize]) -> Vec<CodeLocation> {
- offset_to_location(&self.get_source(file).unwrap_or("".into()), locs)
+ offset_to_location(&self.get_source(file).unwrap_or_else(|| "".into()), locs)
}
pub fn map_from_source_location(
&self,
@@ -396,7 +397,7 @@
data.stack_generation += 1;
result = data
.breakpoints
- .insert(data.stack_depth, data.stack_generation, &e, result);
+ .insert(data.stack_depth, data.stack_generation, e, result);
}
if let Err(mut err) = result {
err.trace_mut().0.push(StackTraceElement {
@@ -486,7 +487,7 @@
pub fn manifest(&self, val: Val) -> Result<IStr> {
self.run_in_state(|| {
push_description_frame(
- || format!("manifestification"),
+ || "manifestification".to_string(),
|| val.manifest(&self.manifest_format()),
)
})
@@ -640,8 +641,8 @@
}
pub fn cc_ptr_eq<T>(a: &Cc<T>, b: &Cc<T>) -> bool {
- let a = &a as &T;
- let b = &b as &T;
+ let a = a as &T;
+ let b = b as &T;
std::ptr::eq(a, b)
}
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth123 }123 }124 }124 }125 for (name, member) in self.0.this_entries.iter() {125 for (name, member) in self.0.this_entries.iter() {126 if handler(name, &member) {126 if handler(name, member) {127 return true;127 return true;128 }128 }129 }129 }