From 9e6e925953adf767c477af5269f31041dd1e5422 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sat, 27 Mar 2021 12:45:22 +0000 Subject: [PATCH] style: fix clippy upper-case-acronyms --- --- a/bindings/jsonnet/src/interop.rs +++ b/bindings/jsonnet/src/interop.rs @@ -46,9 +46,9 @@ #[no_mangle] pub extern "C" fn jrsonnet_set_trace_format(vm: &EvaluationState, format: u8) { - use jrsonnet_evaluator::trace::JSFormat; + use jrsonnet_evaluator::trace::JsFormat; match format { - 1 => vm.set_trace_format(Box::new(JSFormat)), + 1 => vm.set_trace_format(Box::new(JsFormat)), _ => panic!("unknown trace format"), } } --- a/crates/jrsonnet-evaluator/src/builtin/sort.rs +++ b/crates/jrsonnet-evaluator/src/builtin/sort.rs @@ -26,14 +26,14 @@ } #[derive(PartialEq)] -struct NonNaNF64(f64); -impl PartialOrd for NonNaNF64 { +struct NonNaNf64(f64); +impl PartialOrd for NonNaNf64 { fn partial_cmp(&self, other: &Self) -> Option { self.0.partial_cmp(&other.0) } } -impl Eq for NonNaNF64 {} -impl Ord for NonNaNF64 { +impl Eq for NonNaNf64 {} +impl Ord for NonNaNf64 { fn cmp(&self, other: &Self) -> std::cmp::Ordering { self.partial_cmp(other).expect("non nan") } @@ -68,7 +68,7 @@ let sort_type = get_sort_type(mvalues, |k| k)?; match sort_type { SortKeyType::Number => mvalues.sort_by_key(|v| match v { - Val::Num(n) => NonNaNF64(*n), + Val::Num(n) => NonNaNf64(*n), _ => unreachable!(), }), SortKeyType::String => mvalues.sort_by_key(|v| match v { @@ -89,7 +89,7 @@ let sort_type = get_sort_type(&mut vk, |v| &mut v.1)?; match sort_type { SortKeyType::Number => vk.sort_by_key(|v| match v.1 { - Val::Num(n) => NonNaNF64(n), + Val::Num(n) => NonNaNf64(n), _ => unreachable!(), }), SortKeyType::String => vk.sort_by_key(|v| match &v.1 { --- a/crates/jrsonnet-evaluator/src/trace/mod.rs +++ b/crates/jrsonnet-evaluator/src/trace/mod.rs @@ -154,8 +154,8 @@ } } -pub struct JSFormat; -impl TraceFormat for JSFormat { +pub struct JsFormat; +impl TraceFormat for JsFormat { fn write_trace( &self, out: &mut dyn std::fmt::Write, -- gitstuff