git.delta.rocks / jrsonnet / refs/commits / 1111100e839d

difftreelog

style fix clippy warnings

Yaroslav Bolyukin2022-04-20parent: #90e93cc.patch.diff
in: master

4 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
192 inc_hidden: bool,192 inc_hidden: bool,
193 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,193 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,
194) -> Result<VecVal> {194) -> Result<VecVal> {
195 #[cfg(not(feature = "exp-preserve-order"))]
196 let preserve_order = false;
197 #[cfg(feature = "exp-preserve-order")]195 #[cfg(feature = "exp-preserve-order")]
198 let preserve_order = preserve_order.unwrap_or(false);196 let preserve_order = preserve_order.unwrap_or(false);
199 let out = obj.fields_ex(197 let out = obj.fields_ex(
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
680 Ok(Some(push_frame(680 Ok(Some(push_frame(
681 loc,681 loc,
682 || format!("slice {}", desc),682 || format!("slice {}", desc),
683 || Ok(evaluate(context.clone(), value)?.try_into()?),683 || evaluate(context.clone(), value)?.try_into(),
684 )?))684 )?))
685 } else {685 } else {
686 Ok(None)686 Ok(None)
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
19};19};
2020
21#[cfg(not(feature = "exp-preserve-order"))]21#[cfg(not(feature = "exp-preserve-order"))]
22pub(crate) mod ordering {22mod ordering {
23 use gcmodule::Trace;23 use gcmodule::Trace;
2424
25 #[derive(Clone, Copy, Default, Debug, Trace)]25 #[derive(Clone, Copy, Default, Debug, Trace)]
26 pub struct FieldIndex;26 pub struct FieldIndex;
27 impl FieldIndex {27 impl FieldIndex {
28 pub fn next(self) -> Self {28 pub const fn next(self) -> Self {
29 Self29 Self
30 }30 }
31 }31 }
3232
33 #[derive(Clone, Copy, Default, Debug, Trace)]33 #[derive(Clone, Copy, Default, Debug, Trace)]
34 pub struct SuperDepth;34 pub struct SuperDepth;
35 impl SuperDepth {35 impl SuperDepth {
36 pub fn deeper(self) -> Self {36 pub const fn deeper(self) -> Self {
37 Self37 Self
38 }38 }
39 }39 }
4040
41 #[derive(Clone, Copy)]41 #[derive(Clone, Copy)]
42 pub struct FieldSortKey;42 pub struct FieldSortKey;
43 impl FieldSortKey {43 impl FieldSortKey {
44 pub fn new(_: SuperDepth, _: FieldIndex) -> Self {44 pub const fn new(_: SuperDepth, _: FieldIndex) -> Self {
45 Self45 Self
46 }46 }
47 }47 }
87 }87 }
88}88}
8989
90pub(crate) use ordering::*;90use ordering::*;
9191
92#[derive(Debug, Trace)]92#[derive(Debug, Trace)]
93pub struct ObjMember {93pub struct ObjMember {
594 pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {594 pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {
595 self.binding(LazyBinding::Bindable(Cc::new(bindable)))595 self.binding(LazyBinding::Bindable(Cc::new(bindable)))
596 }596 }
597 pub fn binding(self, binding: LazyBinding) -> () {597 pub fn binding(self, binding: LazyBinding) {
598 let (receiver, name, member) = self.build_member(binding);598 let (receiver, name, member) = self.build_member(binding);
599 let new = receiver.0.clone();599 let new = receiver.0.clone();
600 *receiver.0 = new.extend_with_raw_member(name, member)600 *receiver.0 = new.extend_with_raw_member(name, member)
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
201 pub(crate) step: u32,201 pub(crate) step: u32,
202}202}
203impl Slice {203impl Slice {
204 fn from(&self) -> usize {204 const fn from(&self) -> usize {
205 self.from as usize205 self.from as usize
206 }206 }
207 fn to(&self) -> usize {207 const fn to(&self) -> usize {
208 self.to as usize208 self.to as usize
209 }209 }
210 fn step(&self) -> usize {210 const fn step(&self) -> usize {
211 self.step as usize211 self.step as usize
212 }212 }
213 fn len(&self) -> usize {213 const fn len(&self) -> usize {
214 // TODO: use div_ceil214 // TODO: use div_ceil
215 let diff = self.to() - self.from();215 let diff = self.to() - self.from();
216 let rem = diff % self.step();216 let rem = diff % self.step();