git.delta.rocks / jrsonnet / refs/commits / 9e6e925953ad

difftreelog

style fix clippy upper-case-acronyms

Yaroslav Bolyukin2021-03-27parent: #bc97a80.patch.diff
in: master

3 files changed

modifiedbindings/jsonnet/src/interop.rsdiffbeforeafterboth
before · bindings/jsonnet/src/interop.rs
1//! Jrsonnet specific additional binding helpers23use crate::{import::jsonnet_import_callback, native::jsonnet_native_callback};4use jrsonnet_evaluator::{EvaluationState, Val};5use std::{6	ffi::c_void,7	os::raw::{c_char, c_int},8};910extern "C" {11	pub fn _jrsonnet_static_import_callback(12		ctx: *mut c_void,13		base: *const c_char,14		rel: *const c_char,15		found_here: *mut *const c_char,16		success: &mut c_int,17	) -> *const c_char;1819	#[allow(improper_ctypes)]20	pub fn _jrsonnet_static_native_callback(21		ctx: *const c_void,22		argv: *const *const Val,23		success: *mut c_int,24	) -> *mut Val;25}2627/// # Safety28#[no_mangle]29pub unsafe extern "C" fn jrsonnet_apply_static_import_callback(30	vm: &EvaluationState,31	ctx: *mut c_void,32) {33	jsonnet_import_callback(vm, _jrsonnet_static_import_callback, ctx)34}3536/// # Safety37#[no_mangle]38pub unsafe extern "C" fn jrsonnet_apply_static_native_callback(39	vm: &EvaluationState,40	name: *const c_char,41	ctx: *mut c_void,42	raw_params: *const *const c_char,43) {44	jsonnet_native_callback(vm, name, _jrsonnet_static_native_callback, ctx, raw_params)45}4647#[no_mangle]48pub extern "C" fn jrsonnet_set_trace_format(vm: &EvaluationState, format: u8) {49	use jrsonnet_evaluator::trace::JSFormat;50	match format {51		1 => vm.set_trace_format(Box::new(JSFormat)),52		_ => panic!("unknown trace format"),53	}54}
modifiedcrates/jrsonnet-evaluator/src/builtin/sort.rsdiffbeforeafterboth
--- 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<std::cmp::Ordering> {
 		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 {
modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth
--- 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,