difftreelog
style fix clippy upper-case-acronyms
in: master
3 files changed
bindings/jsonnet/src/interop.rsdiffbeforeafterboth464647#[no_mangle]47#[no_mangle]48pub extern "C" fn jrsonnet_set_trace_format(vm: &EvaluationState, format: u8) {48pub extern "C" fn jrsonnet_set_trace_format(vm: &EvaluationState, format: u8) {49 use jrsonnet_evaluator::trace::JSFormat;49 use jrsonnet_evaluator::trace::JsFormat;50 match format {50 match format {51 1 => vm.set_trace_format(Box::new(JSFormat)),51 1 => vm.set_trace_format(Box::new(JsFormat)),52 _ => panic!("unknown trace format"),52 _ => panic!("unknown trace format"),53 }53 }54}54}crates/jrsonnet-evaluator/src/builtin/sort.rsdiffbeforeafterboth26}26}272728#[derive(PartialEq)]28#[derive(PartialEq)]29struct NonNaNF64(f64);29struct NonNaNf64(f64);30impl PartialOrd for NonNaNF64 {30impl PartialOrd for NonNaNf64 {31 fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {31 fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {32 self.0.partial_cmp(&other.0)32 self.0.partial_cmp(&other.0)33 }33 }34}34}35impl Eq for NonNaNF64 {}35impl Eq for NonNaNf64 {}36impl Ord for NonNaNF64 {36impl Ord for NonNaNf64 {37 fn cmp(&self, other: &Self) -> std::cmp::Ordering {37 fn cmp(&self, other: &Self) -> std::cmp::Ordering {38 self.partial_cmp(other).expect("non nan")38 self.partial_cmp(other).expect("non nan")39 }39 }68 let sort_type = get_sort_type(mvalues, |k| k)?;68 let sort_type = get_sort_type(mvalues, |k| k)?;69 match sort_type {69 match sort_type {70 SortKeyType::Number => mvalues.sort_by_key(|v| match v {70 SortKeyType::Number => mvalues.sort_by_key(|v| match v {71 Val::Num(n) => NonNaNF64(*n),71 Val::Num(n) => NonNaNf64(*n),72 _ => unreachable!(),72 _ => unreachable!(),73 }),73 }),74 SortKeyType::String => mvalues.sort_by_key(|v| match v {74 SortKeyType::String => mvalues.sort_by_key(|v| match v {89 let sort_type = get_sort_type(&mut vk, |v| &mut v.1)?;89 let sort_type = get_sort_type(&mut vk, |v| &mut v.1)?;90 match sort_type {90 match sort_type {91 SortKeyType::Number => vk.sort_by_key(|v| match v.1 {91 SortKeyType::Number => vk.sort_by_key(|v| match v.1 {92 Val::Num(n) => NonNaNF64(n),92 Val::Num(n) => NonNaNf64(n),93 _ => unreachable!(),93 _ => unreachable!(),94 }),94 }),95 SortKeyType::String => vk.sort_by_key(|v| match &v.1 {95 SortKeyType::String => vk.sort_by_key(|v| match &v.1 {crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth154 }154 }155}155}156156157pub struct JSFormat;157pub struct JsFormat;158impl TraceFormat for JSFormat {158impl TraceFormat for JsFormat {159 fn write_trace(159 fn write_trace(160 &self,160 &self,161 out: &mut dyn std::fmt::Write,161 out: &mut dyn std::fmt::Write,