difftreelog
fix build on stable
in: master
16 files changed
crates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -26,16 +26,22 @@
/// This kind of arrays is generated by `std.range(start, end)` call, and used for loops.
Range(RangeArray),
/// Sliced array view.
- Slice(Box<SliceArray>),
+ Slice(Cc<SliceArray>),
/// Reversed array view.
/// Returned by `std.reverse(other)` call
- Reverse(Box<ReverseArray>),
+ Reverse(Cc<ReverseArray>),
/// Returned by `std.map` call
Mapped(MappedArray),
/// Returned by `std.repeat` call
Repeated(RepeatedArray),
}
+pub trait ArrayLikeIter<T>: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator {}
+impl<I, T> ArrayLikeIter<T> for I where
+ I: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator
+{
+}
+
impl ArrValue {
pub fn empty() -> Self {
Self::Range(RangeArray::empty())
@@ -123,7 +129,7 @@
return None;
}
- Some(Self::Slice(Box::new(SliceArray {
+ Some(Self::Slice(Cc::new(SliceArray {
inner: self,
from: from as u32,
to: to as u32,
@@ -160,24 +166,26 @@
pass!(self.get_lazy(index))
}
- /// Evaluate all array elements, returning new array.
- pub fn evaluatedcc(&self) -> Result<Cc<Vec<Val>>> {
- self.evaluated().map(Cc::new)
- }
- pub fn evaluated(&self) -> Result<Vec<Val>> {
- pass!(self.evaluated())
- }
-
- /// Iterate over elements, evaluating them.
+ #[cfg(feature = "nightly")]
pub fn iter(&self) -> UnknownArrayIter<'_> {
pass_iter_call!(self.iter => UnknownArrayIter)
}
+ #[cfg(not(feature = "nightly"))]
+ pub fn iter(&self) -> impl ArrayLikeIter<Result<Val>> + '_ {
+ (0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))
+ }
/// Iterate over elements, returning lazy values.
+ #[cfg(feature = "nightly")]
pub fn iter_lazy(&self) -> UnknownArrayIterLazy<'_> {
pass_iter_call!(self.iter_lazy => UnknownArrayIterLazy)
}
+ #[cfg(not(feature = "nightly"))]
+ pub fn iter_lazy(&self) -> impl ArrayLikeIter<Thunk<Val>> + '_ {
+ (0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))
+ }
+ #[cfg(feature = "nightly")]
pub fn iter_cheap(&self) -> Option<UnknownArrayIterCheap<'_>> {
macro_rules! question {
($v:expr) => {
@@ -187,10 +195,19 @@
Some(pass_iter_call!(self.iter_cheap in question => UnknownArrayIterCheap))
}
+ #[cfg(not(feature = "nightly"))]
+ pub fn iter_cheap(&self) -> Option<impl ArrayLikeIter<Val> + '_> {
+ if self.is_cheap() {
+ Some((0..self.len()).map(|i| self.get_cheap(i).expect("length and is_cheap checked")))
+ } else {
+ None
+ }
+ }
+
/// Return a reversed view on current array.
#[must_use]
pub fn reversed(self) -> Self {
- Self::Reverse(Box::new(ReverseArray(self)))
+ Self::Reverse(Cc::new(ReverseArray(self)))
}
pub fn ptr_eq(a: &Self, b: &Self) -> bool {
crates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth1//! Those implementations are a bit sketchy, as this is mostly performance experiments2//! of not yet finished nightly rust features31use std::{4use std::{cell::RefCell, iter, mem::replace};2 cell::RefCell,3 iter::{self, Rev},4 mem::replace,5};657use jrsonnet_gcmodule::{Cc, Trace};6use jrsonnet_gcmodule::{Cc, Trace};8use jrsonnet_interner::IBytes;7use jrsonnet_interner::IBytes;9use jrsonnet_parser::LocExpr;8use jrsonnet_parser::LocExpr;10911use super::ArrValue;10use super::{ArrValue, ArrayLikeIter};12use crate::{11use crate::{13 error::ErrorKind::InfiniteRecursionDetected, evaluate, function::FuncVal, tb, typed::Any,12 error::ErrorKind::InfiniteRecursionDetected, evaluate, function::FuncVal, tb, typed::Any,14 val::ThunkValue, Context, Error, Result, Thunk, Val,13 val::ThunkValue, Context, Error, Result, Thunk, Val,15};14};161517pub trait ArrayLike {16pub trait ArrayLike: Sized + Into<ArrValue> {17 #[cfg(feature = "nightly")]18 type Iter<'t>18 type Iter<'t>19 where19 where20 Self: 't;20 Self: 't;21 #[cfg(feature = "nightly")]21 type IterLazy<'t>22 type IterLazy<'t>22 where23 where23 Self: 't;24 Self: 't;25 #[cfg(feature = "nightly")]24 type IterCheap<'t>26 type IterCheap<'t>25 where27 where26 Self: 't;28 Self: 't;32 fn get(&self, index: usize) -> Result<Option<Val>>;34 fn get(&self, index: usize) -> Result<Option<Val>>;33 fn get_lazy(&self, index: usize) -> Option<Thunk<Val>>;35 fn get_lazy(&self, index: usize) -> Option<Thunk<Val>>;34 fn get_cheap(&self, index: usize) -> Option<Val>;36 fn get_cheap(&self, index: usize) -> Option<Val>;35 fn evaluated(&self) -> Result<Vec<Val>>;37 #[cfg(feature = "nightly")]36 #[allow(clippy::iter_not_returning_iterator)]38 #[allow(clippy::iter_not_returning_iterator)]37 fn iter(&self) -> Self::Iter<'_>;39 fn iter(&self) -> Self::Iter<'_>;40 #[cfg(feature = "nightly")]38 fn iter_lazy(&self) -> Self::IterLazy<'_>;41 fn iter_lazy(&self) -> Self::IterLazy<'_>;42 #[cfg(feature = "nightly")]39 fn iter_cheap(&self) -> Option<Self::IterCheap<'_>>;43 fn iter_cheap(&self) -> Option<Self::IterCheap<'_>>;4445 fn reverse(self) -> ArrValue {46 ArrValue::Reverse(Cc::new(ReverseArray(self.into())))47 }40}48}414942#[derive(Debug, Clone, Trace)]50#[derive(Debug, Clone, Trace)]47 pub(crate) step: u32,55 pub(crate) step: u32,48}56}5758impl SliceArray {59 #[cfg(not(feature = "nightly"))]60 fn iter(&self) -> impl Iterator<Item = Result<Val>> + '_ {61 self.inner62 .iter()63 .skip(self.from as usize)64 .take((self.to - self.from) as usize)65 .step_by(self.step as usize)66 }6768 #[cfg(not(feature = "nightly"))]69 fn iter_lazy(&self) -> impl Iterator<Item = Thunk<Val>> + '_ {70 self.inner71 .iter_lazy()72 .skip(self.from as usize)73 .take((self.to - self.from) as usize)74 .step_by(self.step as usize)75 }7677 #[cfg(not(feature = "nightly"))]78 fn iter_cheap(&self) -> Option<impl ArrayLikeIter<Val> + '_> {79 Some(80 self.inner81 .iter_cheap()?82 .skip(self.from as usize)83 .take((self.to - self.from) as usize)84 .step_by(self.step as usize),85 )86 }87}88#[cfg(feature = "nightly")]49type SliceArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;89type SliceArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;90#[cfg(feature = "nightly")]50type SliceArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;91type SliceArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;92#[cfg(feature = "nightly")]51type SliceArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;93type SliceArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;52impl ArrayLike for SliceArray {94impl ArrayLike for SliceArray {95 #[cfg(feature = "nightly")]53 type Iter<'t> = SliceArrayIter<'t>;96 type Iter<'t> = SliceArrayIter<'t>;5497 #[cfg(feature = "nightly")]55 type IterLazy<'t> = SliceArrayLazyIter<'t>;98 type IterLazy<'t> = SliceArrayLazyIter<'t>;5699 #[cfg(feature = "nightly")]57 type IterCheap<'t> = SliceArrayCheapIter<'t>;100 type IterCheap<'t> = SliceArrayCheapIter<'t>;5810159 fn len(&self) -> usize {102 fn len(&self) -> usize {75 self.iter_cheap()?.nth(index)118 self.iter_cheap()?.nth(index)76 }119 }7712078 fn evaluated(&self) -> Result<Vec<Val>> {121 #[cfg(feature = "nightly")]79 self.iter().collect()80 }8182 fn iter(&self) -> SliceArrayIter<'_> {122 fn iter(&self) -> SliceArrayIter<'_> {83 self.inner123 self.inner87 .step_by(self.step as usize)127 .step_by(self.step as usize)88 }128 }89129130 #[cfg(feature = "nightly")]90 fn iter_lazy(&self) -> SliceArrayLazyIter<'_> {131 fn iter_lazy(&self) -> SliceArrayLazyIter<'_> {91 self.inner132 self.inner92 .iter_lazy()133 .iter_lazy()95 .step_by(self.step as usize)136 .step_by(self.step as usize)96 }137 }97138139 #[cfg(feature = "nightly")]98 fn iter_cheap(&self) -> Option<SliceArrayCheapIter<'_>> {140 fn iter_cheap(&self) -> Option<SliceArrayCheapIter<'_>> {99 Some(141 Some(100 self.inner142 self.inner105 )147 )106 }148 }107}149}150impl From<SliceArray> for ArrValue {151 fn from(value: SliceArray) -> Self {152 Self::Slice(Cc::new(value))153 }154}108155109#[derive(Trace, Debug, Clone)]156#[derive(Trace, Debug, Clone)]110pub struct BytesArray(pub IBytes);157pub struct BytesArray(pub IBytes);158#[cfg(feature = "nightly")]111type BytesArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;159type BytesArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;160#[cfg(feature = "nightly")]112type BytesArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;161type BytesArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;162#[cfg(feature = "nightly")]113type BytesArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;163type BytesArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;114impl ArrayLike for BytesArray {164impl ArrayLike for BytesArray {165 #[cfg(feature = "nightly")]115 type Iter<'t> = BytesArrayIter<'t>;166 type Iter<'t> = BytesArrayIter<'t>;116167 #[cfg(feature = "nightly")]117 type IterLazy<'t> = BytesArrayLazyIter<'t>;168 type IterLazy<'t> = BytesArrayLazyIter<'t>;118169 #[cfg(feature = "nightly")]119 type IterCheap<'t> = BytesArrayCheapIter<'t>;170 type IterCheap<'t> = BytesArrayCheapIter<'t>;120171121 fn len(&self) -> usize {172 fn len(&self) -> usize {134 self.0.get(index).map(|v| Val::Num(f64::from(*v)))185 self.0.get(index).map(|v| Val::Num(f64::from(*v)))135 }186 }136187137 fn evaluated(&self) -> Result<Vec<Val>> {188 #[cfg(feature = "nightly")]138 self.iter().collect()139 }140141 fn iter(&self) -> BytesArrayIter<'_> {189 fn iter(&self) -> BytesArrayIter<'_> {142 self.0.iter().map(|v| Ok(Val::Num(f64::from(*v))))190 self.0.iter().map(|v| Ok(Val::Num(f64::from(*v))))143 }191 }144192193 #[cfg(feature = "nightly")]145 fn iter_lazy(&self) -> BytesArrayLazyIter<'_> {194 fn iter_lazy(&self) -> BytesArrayLazyIter<'_> {146 self.0195 self.0147 .iter()196 .iter()148 .map(|v| Thunk::evaluated(Val::Num(f64::from(*v))))197 .map(|v| Thunk::evaluated(Val::Num(f64::from(*v))))149 }198 }150199200 #[cfg(feature = "nightly")]151 fn iter_cheap(&self) -> Option<BytesArrayCheapIter<'_>> {201 fn iter_cheap(&self) -> Option<BytesArrayCheapIter<'_>> {152 Some(self.0.iter().map(|v| Val::Num(f64::from(*v))))202 Some(self.0.iter().map(|v| Val::Num(f64::from(*v))))153 }203 }154}204}205impl From<BytesArray> for ArrValue {206 fn from(value: BytesArray) -> Self {207 ArrValue::Bytes(value)208 }209}155210156#[derive(Debug, Trace, Clone)]211#[derive(Debug, Trace, Clone)]157enum ArrayThunk<T: 'static + Trace> {212enum ArrayThunk<T: 'static + Trace> {168}223}169#[derive(Debug, Trace, Clone)]224#[derive(Debug, Trace, Clone)]170pub struct ExprArray(pub Cc<ExprArrayInner>);225pub struct ExprArray(pub Cc<ExprArrayInner>);171type ExprArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;172type ExprArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;173type ExprArrayCheapIter<'t> = iter::Empty<Val>;174impl ExprArray {226impl ExprArray {175 pub fn new(ctx: Context, items: impl IntoIterator<Item = LocExpr>) -> Self {227 pub fn new(ctx: Context, items: impl IntoIterator<Item = LocExpr>) -> Self {176 Self(Cc::new(ExprArrayInner {228 Self(Cc::new(ExprArrayInner {179 }))231 }))180 }232 }181}233}234#[cfg(feature = "nightly")]235type ExprArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;236#[cfg(feature = "nightly")]237type ExprArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;238#[cfg(feature = "nightly")]239type ExprArrayCheapIter<'t> = iter::Empty<Val>;182impl ArrayLike for ExprArray {240impl ArrayLike for ExprArray {241 #[cfg(feature = "nightly")]183 type Iter<'t> = ExprArrayIter<'t>;242 type Iter<'t> = ExprArrayIter<'t>;184243 #[cfg(feature = "nightly")]185 type IterLazy<'t> = ExprArrayLazyIter<'t>;244 type IterLazy<'t> = ExprArrayLazyIter<'t>;186245 #[cfg(feature = "nightly")]187 type IterCheap<'t> = ExprArrayCheapIter<'t>;246 type IterCheap<'t> = ExprArrayCheapIter<'t>;188247189 fn len(&self) -> usize {248 fn len(&self) -> usize {250 None309 None251 }310 }252311312 #[cfg(feature = "nightly")]253 fn iter(&self) -> ExprArrayIter<'_> {313 fn iter(&self) -> ExprArrayIter<'_> {254 (0..self.len()).map(|i| self.get(i).transpose().expect("index checked"))314 (0..self.len()).map(|i| self.get(i).transpose().expect("index checked"))255 }315 }316 #[cfg(feature = "nightly")]256 fn iter_lazy(&self) -> ExprArrayLazyIter<'_> {317 fn iter_lazy(&self) -> ExprArrayLazyIter<'_> {257 (0..self.len()).map(|i| self.get_lazy(i).expect("index checked"))318 (0..self.len()).map(|i| self.get_lazy(i).expect("index checked"))258 }319 }320 #[cfg(feature = "nightly")]259 fn iter_cheap(&self) -> Option<ExprArrayCheapIter<'_>> {321 fn iter_cheap(&self) -> Option<Self::IterCheap<'_>> {260 None322 None261 }323 }262263 fn evaluated(&self) -> Result<Vec<Val>> {264 self.iter().collect()265 }266}324}325impl From<ExprArray> for ArrValue {326 fn from(value: ExprArray) -> Self {327 Self::Expr(value)328 }329}267330268#[derive(Trace, Debug, Clone)]331#[derive(Trace, Debug, Clone)]269pub struct ExtendedArray {332pub struct ExtendedArray {272 split: usize,335 split: usize,273 len: usize,336 len: usize,274}337}338#[cfg(feature = "nightly")]339275type ExtendedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + 't;340type ExtendedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;341#[cfg(feature = "nightly")]276type ExtendedArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + 't;342type ExtendedArrayLazyIter<'t> =343 impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;344#[cfg(feature = "nightly")]277type ExtendedArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + 't;345type ExtendedArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;278impl ExtendedArray {346impl ExtendedArray {279 pub fn new(a: ArrValue, b: ArrValue) -> Self {347 pub fn new(a: ArrValue, b: ArrValue) -> Self {280 let a_len = a.len();348 let a_len = a.len();288 }356 }289}357}358359struct WithExactSize<I>(I, usize);360impl<I, T> Iterator for WithExactSize<I>361where362 I: Iterator<Item = T>,363{364 type Item = T;365366 fn next(&mut self) -> Option<Self::Item> {367 self.0.next()368 }369 fn nth(&mut self, n: usize) -> Option<Self::Item> {370 self.0.nth(n)371 }372 fn size_hint(&self) -> (usize, Option<usize>) {373 (self.1, Some(self.1))374 }375}376impl<I> DoubleEndedIterator for WithExactSize<I>377where378 I: DoubleEndedIterator,379{380 fn next_back(&mut self) -> Option<Self::Item> {381 self.0.next_back()382 }383 fn nth_back(&mut self, n: usize) -> Option<Self::Item> {384 self.0.nth_back(n)385 }386}387impl<I> ExactSizeIterator for WithExactSize<I>388where389 I: Iterator,390{391 fn len(&self) -> usize {392 self.1393 }394}290impl ArrayLike for ExtendedArray {395impl ArrayLike for ExtendedArray {396 #[cfg(feature = "nightly")]291 type Iter<'t> = ExtendedArrayIter<'t>;397 type Iter<'t> = ExtendedArrayIter<'t>;292398 #[cfg(feature = "nightly")]293 type IterLazy<'t> = ExtendedArrayLazyIter<'t>;399 type IterLazy<'t> = ExtendedArrayLazyIter<'t>;294400 #[cfg(feature = "nightly")]295 type IterCheap<'t> = ExtendedArrayCheapIter<'t>;401 type IterCheap<'t> = ExtendedArrayCheapIter<'t>;296402297 fn get(&self, index: usize) -> Result<Option<Val>> {403 fn get(&self, index: usize) -> Result<Option<Val>> {321 }427 }322 }428 }323429324 fn evaluated(&self) -> Result<Vec<Val>> {430 #[cfg(feature = "nightly")]325 let mut out = self.a.evaluated()?;326 out.extend(self.b.evaluated()?.into_iter());327 Ok(out)328 }329330 fn iter(&self) -> ExtendedArrayIter<'_> {431 fn iter(&self) -> ExtendedArrayIter<'_> {331 self.a.iter().chain(self.b.iter())432 WithExactSize(self.a.iter().chain(self.b.iter()), self.len)332 }433 }434 #[cfg(feature = "nightly")]333 fn iter_lazy(&self) -> ExtendedArrayLazyIter<'_> {435 fn iter_lazy(&self) -> ExtendedArrayLazyIter<'_> {334 self.a.iter_lazy().chain(self.b.iter_lazy())436 WithExactSize(self.a.iter_lazy().chain(self.b.iter_lazy()), self.len)335 }437 }438 #[cfg(feature = "nightly")]336 fn iter_cheap(&self) -> Option<ExtendedArrayCheapIter<'_>> {439 fn iter_cheap(&self) -> Option<ExtendedArrayCheapIter<'_>> {337 let a = self.a.iter_cheap()?;440 let a = self.a.iter_cheap()?;338 let b = self.b.iter_cheap()?;441 let b = self.b.iter_cheap()?;339 Some(a.chain(b))442 Some(WithExactSize(a.chain(b), self.len))340 }443 }341}444}445impl From<ExtendedArray> for ArrValue {446 fn from(value: ExtendedArray) -> Self {447 Self::Extended(Cc::new(value))448 }449}342450343#[derive(Trace, Debug, Clone)]451#[derive(Trace, Debug, Clone)]344pub struct LazyArray(pub Cc<Vec<Thunk<Val>>>);452pub struct LazyArray(pub Cc<Vec<Thunk<Val>>>);453#[cfg(feature = "nightly")]345type LazyArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;454type LazyArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;455#[cfg(feature = "nightly")]346type LazyArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;456type LazyArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;457#[cfg(feature = "nightly")]347type LazyArrayCheapIter<'t> = iter::Empty<Val>;458type LazyArrayCheapIter<'t> = iter::Empty<Val>;348impl ArrayLike for LazyArray {459impl ArrayLike for LazyArray {460 #[cfg(feature = "nightly")]349 type Iter<'t> = LazyArrayIter<'t>;461 type Iter<'t> = LazyArrayIter<'t>;350462463 #[cfg(feature = "nightly")]351 type IterLazy<'t> = LazyArrayLazyIter<'t>;464 type IterLazy<'t> = LazyArrayLazyIter<'t>;352465466 #[cfg(feature = "nightly")]353 type IterCheap<'t> = LazyArrayCheapIter<'t>;467 type IterCheap<'t> = LazyArrayCheapIter<'t>;354468355 fn len(&self) -> usize {469 fn len(&self) -> usize {367 fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {481 fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {368 self.0.get(index).cloned()482 self.0.get(index).cloned()369 }483 }370 fn evaluated(&self) -> Result<Vec<Val>> {484 #[cfg(feature = "nightly")]371 let mut out = Vec::with_capacity(self.len());372 for i in self.0.iter() {373 out.push(i.evaluate()?);374 }375 Ok(out)376 }377 fn iter(&self) -> LazyArrayIter<'_> {485 fn iter(&self) -> LazyArrayIter<'_> {378 self.0.iter().map(Thunk::evaluate)486 self.0.iter().map(Thunk::evaluate)379 }487 }488 #[cfg(feature = "nightly")]380 fn iter_lazy(&self) -> LazyArrayLazyIter<'_> {489 fn iter_lazy(&self) -> LazyArrayLazyIter<'_> {381 self.0.iter().cloned()490 self.0.iter().cloned()382 }491 }492 #[cfg(feature = "nightly")]383 fn iter_cheap(&self) -> Option<LazyArrayCheapIter<'_>> {493 fn iter_cheap(&self) -> Option<LazyArrayCheapIter<'_>> {384 None494 None385 }495 }386}496}497impl From<LazyArray> for ArrValue {498 fn from(value: LazyArray) -> Self {499 Self::Lazy(value)500 }501}387502388#[derive(Trace, Debug, Clone)]503#[derive(Trace, Debug, Clone)]389pub struct EagerArray(pub Cc<Vec<Val>>);504pub struct EagerArray(pub Cc<Vec<Val>>);505#[cfg(feature = "nightly")]390type EagerArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;506type EagerArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;507#[cfg(feature = "nightly")]391type EagerArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;508type EagerArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;509#[cfg(feature = "nightly")]392type EagerArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;510type EagerArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;393impl ArrayLike for EagerArray {511impl ArrayLike for EagerArray {512 #[cfg(feature = "nightly")]394 type Iter<'t> = EagerArrayIter<'t>;513 type Iter<'t> = EagerArrayIter<'t>;395514515 #[cfg(feature = "nightly")]396 type IterLazy<'t> = EagerArrayLazyIter<'t>;516 type IterLazy<'t> = EagerArrayLazyIter<'t>;397517518 #[cfg(feature = "nightly")]398 type IterCheap<'t> = EagerArrayCheapIter<'t>;519 type IterCheap<'t> = EagerArrayCheapIter<'t>;399520400 fn len(&self) -> usize {521 fn len(&self) -> usize {413 self.0.get(index).cloned()534 self.0.get(index).cloned()414 }535 }415536416 fn evaluated(&self) -> Result<Vec<Val>> {537 #[cfg(feature = "nightly")]417 Ok((*self.0).clone())418 }419420 fn iter(&self) -> EagerArrayIter<'_> {538 fn iter(&self) -> EagerArrayIter<'_> {421 self.0.iter().cloned().map(Ok)539 self.0.iter().cloned().map(Ok)422 }540 }423541542 #[cfg(feature = "nightly")]424 fn iter_lazy(&self) -> EagerArrayLazyIter<'_> {543 fn iter_lazy(&self) -> EagerArrayLazyIter<'_> {425 self.0.iter().cloned().map(Thunk::evaluated)544 self.0.iter().cloned().map(Thunk::evaluated)426 }545 }427546547 #[cfg(feature = "nightly")]428 fn iter_cheap(&self) -> Option<EagerArrayCheapIter<'_>> {548 fn iter_cheap(&self) -> Option<EagerArrayCheapIter<'_>> {429 Some(self.0.iter().cloned())549 Some(self.0.iter().cloned())430 }550 }431}551}552impl From<EagerArray> for ArrValue {553 fn from(value: EagerArray) -> Self {554 Self::Eager(value)555 }556}432557433/// Inclusive range type558/// Inclusive range type434#[derive(Debug, Trace, Clone, PartialEq, Eq)]559#[derive(Debug, Trace, Clone, PartialEq, Eq)]435pub struct RangeArray {560pub struct RangeArray {436 start: i32,561 start: i32,437 end: i32,562 end: i32,438}563}439struct RangeIter {440 start: i32,441 end: i32,442}443impl RangeIter {444 fn finished(&self) -> bool {445 self.end < self.start446 }447 fn finish(&mut self) {448 self.start = 0;449 self.end = -1;450 }451}452impl Iterator for RangeIter {453 type Item = i32;454455 fn next(&mut self) -> Option<Self::Item> {456 if self.finished() {457 return None;458 }459 let v = self.start;460 if v == self.end {461 self.finish();462 } else {463 self.start = v + 1;464 }465 Some(v)466 }467 fn nth(&mut self, n: usize) -> Option<Self::Item> {468 let v = (self.start as usize) + n;469 if v > self.end as usize {470 self.finish();471 None472 } else {473 self.start = v as i32;474 self.next()475 }476 }477 fn size_hint(&self) -> (usize, Option<usize>) {478 let len = self.len();479 (len, Some(len))480 }481}482impl DoubleEndedIterator for RangeIter {483 fn next_back(&mut self) -> Option<Self::Item> {484 if self.finished() {485 return None;486 }487 let v = self.end;488 if v == self.start {489 self.finish();490 } else {491 self.end = v - 1;492 }493 Some(v)494 }495 fn nth_back(&mut self, n: usize) -> Option<Self::Item> {496 let v = (self.end as usize) - n;497 if v < self.start as usize {498 self.finish();499 None500 } else {501 self.end = v as i32;502 self.next_back()503 }504 }505}506impl ExactSizeIterator for RangeIter {507 fn len(&self) -> usize {508 if self.finished() {509 0510 } else {511 (self.end as isize - self.start as isize + 1) as usize512 }513 }514}515impl RangeArray {564impl RangeArray {516 pub fn empty() -> Self {565 pub fn empty() -> Self {517 Self::new_exclusive(0, 0)566 Self::new_exclusive(0, 0)523 pub fn new_inclusive(start: i32, end: i32) -> Self {572 pub fn new_inclusive(start: i32, end: i32) -> Self {524 Self { start, end }573 Self { start, end }525 }574 }526 fn range(&self) -> RangeIter {575 fn range(&self) -> impl Iterator<Item = i32> + ExactSizeIterator + DoubleEndedIterator {527 RangeIter {576 WithExactSize(528 start: self.start,577 self.start..=self.end,529 end: self.end,578 (self.end as usize)530 }579 .wrapping_sub(self.start as usize)580 .wrapping_add(1),581 )531 }582 }532}583}533584585#[cfg(feature = "nightly")]534type RangeArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;586type RangeArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;587#[cfg(feature = "nightly")]535type RangeArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;588type RangeArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;589#[cfg(feature = "nightly")]536type RangeArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;590type RangeArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;537impl ArrayLike for RangeArray {591impl ArrayLike for RangeArray {592 #[cfg(feature = "nightly")]538 type Iter<'t> = RangeArrayIter<'t>;593 type Iter<'t> = RangeArrayIter<'t>;539594595 #[cfg(feature = "nightly")]540 type IterLazy<'t> = RangeArrayLazyIter<'t>;596 type IterLazy<'t> = RangeArrayLazyIter<'t>;541597598 #[cfg(feature = "nightly")]542 type IterCheap<'t> = RangeArrayCheapIter<'t>;599 type IterCheap<'t> = RangeArrayCheapIter<'t>;543600544 fn len(&self) -> usize {601 fn len(&self) -> usize {545 self.range().len()602 self.range().len()546 }603 }547 fn is_empty(&self) -> bool {604 fn is_empty(&self) -> bool {548 self.range().finished()605 self.range().len() == 0549 }606 }550607551 fn get(&self, index: usize) -> Result<Option<Val>> {608 fn get(&self, index: usize) -> Result<Option<Val>> {560 self.range().nth(index).map(|i| Val::Num(f64::from(i)))617 self.range().nth(index).map(|i| Val::Num(f64::from(i)))561 }618 }562619563 fn evaluated(&self) -> Result<Vec<Val>> {620 #[cfg(feature = "nightly")]564 Ok(self.range().map(|i| Val::Num(f64::from(i))).collect())565 }566567 fn iter(&self) -> RangeArrayIter<'_> {621 fn iter(&self) -> RangeArrayIter<'_> {568 self.range().map(|i| Ok(Val::Num(f64::from(i))))622 self.range().map(|i| Ok(Val::Num(f64::from(i))))569 }623 }570624625 #[cfg(feature = "nightly")]571 fn iter_lazy(&self) -> RangeArrayLazyIter<'_> {626 fn iter_lazy(&self) -> RangeArrayLazyIter<'_> {572 self.range()627 self.range()573 .map(|i| Thunk::evaluated(Val::Num(f64::from(i))))628 .map(|i| Thunk::evaluated(Val::Num(f64::from(i))))574 }629 }575630631 #[cfg(feature = "nightly")]576 fn iter_cheap(&self) -> Option<RangeArrayCheapIter<'_>> {632 fn iter_cheap(&self) -> Option<RangeArrayCheapIter<'_>> {577 Some(self.range().map(|i| Val::Num(f64::from(i))))633 Some(self.range().map(|i| Val::Num(f64::from(i))))578 }634 }579}635}636impl From<RangeArray> for ArrValue {637 fn from(value: RangeArray) -> Self {638 Self::Range(value)639 }640}580641581#[derive(Debug, Trace, Clone)]642#[derive(Debug, Trace, Clone)]582pub struct ReverseArray(pub ArrValue);643pub struct ReverseArray(pub ArrValue);583impl ArrayLike for ReverseArray {644impl ArrayLike for ReverseArray {645 #[cfg(feature = "nightly")]584 type Iter<'t> = Rev<UnknownArrayIter<'t>>;646 type Iter<'t> = iter::Rev<UnknownArrayIter<'t>>;585647648 #[cfg(feature = "nightly")]586 type IterLazy<'t> = Rev<UnknownArrayIterLazy<'t>>;649 type IterLazy<'t> = iter::Rev<UnknownArrayIterLazy<'t>>;587650651 #[cfg(feature = "nightly")]588 type IterCheap<'t> = Rev<UnknownArrayIterCheap<'t>>;652 type IterCheap<'t> = iter::Rev<UnknownArrayIterCheap<'t>>;589653590 fn len(&self) -> usize {654 fn len(&self) -> usize {591 self.0.len()655 self.0.len()603 self.0.get_cheap(self.0.len() - index - 1)667 self.0.get_cheap(self.0.len() - index - 1)604 }668 }605669606 fn evaluated(&self) -> Result<Vec<Val>> {670 #[cfg(feature = "nightly")]607 let mut v = self.0.evaluated()?;608 v.reverse();609 Ok(v)610 }611612 fn iter(&self) -> Rev<UnknownArrayIter<'_>> {671 fn iter(&self) -> iter::Rev<UnknownArrayIter<'_>> {613 self.0.iter().rev()672 self.0.iter().rev()614 }673 }615674675 #[cfg(feature = "nightly")]616 fn iter_lazy(&self) -> Rev<UnknownArrayIterLazy<'_>> {676 fn iter_lazy(&self) -> iter::Rev<UnknownArrayIterLazy<'_>> {617 self.0.iter_lazy().rev()677 self.0.iter_lazy().rev()618 }678 }619679680 #[cfg(feature = "nightly")]620 fn iter_cheap(&self) -> Option<Rev<UnknownArrayIterCheap<'_>>> {681 fn iter_cheap(&self) -> Option<iter::Rev<UnknownArrayIterCheap<'_>>> {621 Some(self.0.iter_cheap()?.rev())682 Some(self.0.iter_cheap()?.rev())622 }683 }684 fn reverse(self) -> ArrValue {685 self.0686 }623}687}688impl From<ReverseArray> for ArrValue {689 fn from(value: ReverseArray) -> Self {690 Self::Reverse(Cc::new(value))691 }692}624693625#[derive(Trace, Debug)]694#[derive(Trace, Debug)]626pub struct MappedArrayInner {695pub struct MappedArrayInner {640 }))709 }))641 }710 }642}711}712#[cfg(feature = "nightly")]643type MappedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;713type MappedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;714#[cfg(feature = "nightly")]644type MappedArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;715type MappedArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;716#[cfg(feature = "nightly")]645type MappedArrayCheapIter<'t> = iter::Empty<Val>;717type MappedArrayCheapIter<'t> = iter::Empty<Val>;646impl ArrayLike for MappedArray {718impl ArrayLike for MappedArray {719 #[cfg(feature = "nightly")]647 type Iter<'t> = MappedArrayIter<'t>;720 type Iter<'t> = MappedArrayIter<'t>;721 #[cfg(feature = "nightly")]648 type IterLazy<'t> = MappedArrayLazyIter<'t>;722 type IterLazy<'t> = MappedArrayLazyIter<'t>;723 #[cfg(feature = "nightly")]649 type IterCheap<'t> = MappedArrayCheapIter<'t>;724 type IterCheap<'t> = MappedArrayCheapIter<'t>;650725651 fn len(&self) -> usize {726 fn len(&self) -> usize {722 None797 None723 }798 }724799725 fn evaluated(&self) -> Result<Vec<Val>> {800 #[cfg(feature = "nightly")]726 self.iter().collect()727 }728729 fn iter(&self) -> MappedArrayIter<'_> {801 fn iter(&self) -> MappedArrayIter<'_> {730 (0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))802 (0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))731 }803 }732804805 #[cfg(feature = "nightly")]733 fn iter_lazy(&self) -> MappedArrayLazyIter<'_> {806 fn iter_lazy(&self) -> MappedArrayLazyIter<'_> {734 (0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))807 (0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))735 }808 }736809810 #[cfg(feature = "nightly")]737 fn iter_cheap(&self) -> Option<Self::IterCheap<'_>> {811 fn iter_cheap(&self) -> Option<Self::IterCheap<'_>> {738 None812 None739 }813 }740}814}741// impl MappedArray815impl From<MappedArray> for ArrValue {816 fn from(value: MappedArray) -> Self {817 Self::Mapped(value)818 }819}742820743#[derive(Trace, Debug)]821#[derive(Trace, Debug)]744pub struct RepeatedArrayInner {822pub struct RepeatedArrayInner {762 }840 }763}841}764842843#[cfg(feature = "nightly")]765type RepeatedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;844type RepeatedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;845#[cfg(feature = "nightly")]766type RepeatedArrayLazyIter<'t> =846type RepeatedArrayLazyIter<'t> =767 impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;847 impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;848#[cfg(feature = "nightly")]768type RepeatedArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;849type RepeatedArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;769impl ArrayLike for RepeatedArray {850impl ArrayLike for RepeatedArray {851 #[cfg(feature = "nightly")]770 type Iter<'t> = RepeatedArrayIter<'t>;852 type Iter<'t> = RepeatedArrayIter<'t>;853 #[cfg(feature = "nightly")]771 type IterLazy<'t> = RepeatedArrayLazyIter<'t>;854 type IterLazy<'t> = RepeatedArrayLazyIter<'t>;855 #[cfg(feature = "nightly")]772 type IterCheap<'t> = RepeatedArrayCheapIter<'t>;856 type IterCheap<'t> = RepeatedArrayCheapIter<'t>;773857774 fn len(&self) -> usize {858 fn len(&self) -> usize {796 self.0.data.get_cheap(index % self.0.data.len())880 self.0.data.get_cheap(index % self.0.data.len())797 }881 }798882799 fn evaluated(&self) -> Result<Vec<Val>> {883 #[cfg(feature = "nightly")]800 let mut data = self.0.data.evaluated()?;801 let data_range = 0..data.len();802 for _ in 1..self.0.repeats {803 data.extend_from_within(data_range.clone());804 }805 Ok(data)806 }807808 fn iter(&self) -> RepeatedArrayIter<'_> {884 fn iter(&self) -> RepeatedArrayIter<'_> {809 (0..self.0.total_len)885 (0..self.0.total_len)810 .map(|i| self.get(i))886 .map(|i| self.get(i))811 .map(Result::transpose)887 .map(Result::transpose)812 .map(Option::unwrap)888 .map(Option::unwrap)813 }889 }814890891 #[cfg(feature = "nightly")]815 fn iter_lazy(&self) -> RepeatedArrayLazyIter<'_> {892 fn iter_lazy(&self) -> RepeatedArrayLazyIter<'_> {816 (0..self.0.total_len)893 (0..self.0.total_len)817 .map(|i| self.get_lazy(i))894 .map(|i| self.get_lazy(i))818 .map(Option::unwrap)895 .map(Option::unwrap)819 }896 }820897898 #[cfg(feature = "nightly")]821 fn iter_cheap(&self) -> Option<RepeatedArrayCheapIter<'_>> {899 fn iter_cheap(&self) -> Option<RepeatedArrayCheapIter<'_>> {822 if !self.0.data.is_cheap() {900 if !self.0.data.is_cheap() {823 return None;901 return None;829 )907 )830 }908 }831}909}832910impl From<RepeatedArray> for ArrValue {911 fn from(value: RepeatedArray) -> Self {912 Self::Repeated(value)913 }914}915916#[cfg(feature = "nightly")]833macro_rules! impl_iter_enum {917macro_rules! impl_iter_enum {834 ($n:ident => $v:ident) => {918 ($n:ident => $v:ident) => {835 pub enum $n<'t> {919 pub enum $n<'t> {865}949}866pub(super) use pass;950pub(super) use pass;867951952#[cfg(feature = "nightly")]868macro_rules! pass_iter_call {953macro_rules! pass_iter_call {869 ($t:ident.$c:ident $(in $wrap:ident)? => $e:ident) => {954 ($t:ident.$c:ident $(in $wrap:ident)? => $e:ident) => {870 match $t {955 match $t {881 }966 }882 };967 };883}968}969#[cfg(feature = "nightly")]884pub(super) use pass_iter_call;970pub(super) use pass_iter_call;885971972#[cfg(feature = "nightly")]886macro_rules! impl_iter {973macro_rules! impl_iter {887 ($t:ident => $out:ty) => {974 ($t:ident => $out:ty) => {888 impl Iterator for $t<'_> {975 impl Iterator for $t<'_> {927 };1014 };928}1015}92910161017#[cfg(feature = "nightly")]930impl_iter_enum!(UnknownArrayIter => Iter);1018impl_iter_enum!(UnknownArrayIter => Iter);1019#[cfg(feature = "nightly")]931impl_iter_enum!(UnknownArrayIterLazy => IterLazy);1020impl_iter!(UnknownArrayIter => Result<Val>);1021#[cfg(feature = "nightly")]932impl_iter_enum!(UnknownArrayIterCheap => IterCheap);1022impl_iter_enum!(UnknownArrayIterLazy => IterLazy);1023#[cfg(feature = "nightly")]933impl_iter!(UnknownArrayIter => Result<Val>);1024impl_iter!(UnknownArrayIterLazy => Thunk<Val>);1025#[cfg(feature = "nightly")]934impl_iter!(UnknownArrayIterLazy => Thunk<Val>);1026impl_iter_enum!(UnknownArrayIterCheap => IterCheap);1027#[cfg(feature = "nightly")]935impl_iter!(UnknownArrayIterCheap => Val);1028impl_iter!(UnknownArrayIterCheap => Val);9361029crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -414,7 +414,7 @@
#[allow(clippy::too_many_lines)]
pub fn evaluate(ctx: Context, expr: &LocExpr) -> Result<Val> {
use Expr::*;
- if let Some(trivial) = evaluate_trivial(&expr) {
+ if let Some(trivial) = evaluate_trivial(expr) {
return Ok(trivial);
}
let LocExpr(expr, loc) = expr;
crates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -96,16 +96,37 @@
(Str(a), Str(b)) => a.cmp(b),
(Num(a), Num(b)) => a.partial_cmp(b).expect("jsonnet numbers are non NaN"),
(Arr(a), Arr(b)) => {
- let ai = a.iter();
- let bi = b.iter();
+ if let (Some(ai), Some(bi)) = (a.iter_cheap(), b.iter_cheap()) {
+ for (a, b) in ai.zip(bi) {
+ let ord = evaluate_compare_op(&a, &b, op)?;
+ if !ord.is_eq() {
+ return Ok(ord);
+ }
+ }
+ } else {
+ {
+ let ai = a.iter();
+ let bi = b.iter();
- for (a, b) in ai.zip(bi) {
- let ord = evaluate_compare_op(&a?, &b?, op)?;
- if !ord.is_eq() {
- return Ok(ord);
+ for (a, b) in ai.zip(bi) {
+ let ord = evaluate_compare_op(&a?, &b?, op)?;
+ if !ord.is_eq() {
+ return Ok(ord);
+ }
+ }
}
- }
+ // {
+ // let ai = a.iter_expl();
+ // let bi = b.iter_expl();
+ // for (a, b) in ai.zip(bi) {
+ // let ord = evaluate_compare_op(&a?, &b?, op)?;
+ // if !ord.is_eq() {
+ // return Ok(ord);
+ // }
+ // }
+ // }
+ }
a.len().cmp(&b.len())
}
(_, _) => throw!(BinaryOperatorDoesNotOperateOnValues(
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -1,6 +1,5 @@
//! jsonnet interpreter implementation
-#![cfg_attr(feature = "nightly", feature(thread_local))]
-#![feature(type_alias_impl_trait)]
+#![cfg_attr(feature = "nightly", feature(thread_local, type_alias_impl_trait))]
#![deny(unsafe_op_in_unsafe_fn)]
#![warn(
clippy::all,
crates/jrsonnet-evaluator/src/stdlib/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/stdlib/mod.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/mod.rs
@@ -13,9 +13,9 @@
|| format!("std.format of {str}"),
|| {
Ok(match vals {
- Val::Arr(vals) => format_arr(&str, &vals.evaluatedcc()?)?,
- Val::Obj(obj) => format_obj(&str, &obj)?,
- o => format_arr(&str, &[o])?,
+ Val::Arr(vals) => format_arr(str, &vals.iter().collect::<Result<Vec<_>>>()?)?,
+ Val::Obj(obj) => format_obj(str, &obj)?,
+ o => format_arr(str, &[o])?,
})
},
)
crates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -278,19 +278,19 @@
}
/// Specialization, provides faster `TryFrom<VecVal>` for Val
-pub struct VecVal(pub Cc<Vec<Val>>);
+pub struct VecVal(pub Vec<Val>);
impl Typed for VecVal {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);
fn into_untyped(value: Self) -> Result<Val> {
- Ok(Val::Arr(ArrValue::eager(value.0)))
+ Ok(Val::Arr(ArrValue::eager(Cc::new(value.0))))
}
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
- Val::Arr(a) => Ok(Self(a.evaluatedcc()?)),
+ Val::Arr(a) => Ok(Self(a.iter().collect::<Result<Vec<_>>>()?)),
_ => unreachable!(),
}
}
crates/jrsonnet-parser/src/source.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/source.rs
+++ b/crates/jrsonnet-parser/src/source.rs
@@ -33,8 +33,8 @@
}
fn dyn_eq(&self, other: &dyn $T) -> bool {
let Some(other) = other.as_any().downcast_ref::<Self>() else {
- return false
- };
+ return false
+ };
let this = <Self as $T>::as_any(self)
.downcast_ref::<Self>()
.expect("restricted by impl");
crates/jrsonnet-stdlib/src/objects.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/objects.rs
+++ b/crates/jrsonnet-stdlib/src/objects.rs
@@ -5,7 +5,6 @@
val::{StrValue, Val},
IStr, ObjValue,
};
-use jrsonnet_gcmodule::Cc;
#[builtin]
pub fn builtin_object_fields_ex(
@@ -20,12 +19,12 @@
#[cfg(feature = "exp-preserve-order")]
preserve_order,
);
- Ok(VecVal(Cc::new(
+ Ok(VecVal(
out.into_iter()
.map(StrValue::Flat)
.map(Val::Str)
.collect::<Vec<_>>(),
- )))
+ ))
}
#[builtin]
crates/jrsonnet-stdlib/src/sort.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/sort.rs
+++ b/crates/jrsonnet-stdlib/src/sort.rs
@@ -50,13 +50,12 @@
}
/// * `key_getter` - None, if identity sort required
-pub fn sort(ctx: Context, values: Cc<Vec<Val>>, key_getter: FuncVal) -> Result<Cc<Vec<Val>>> {
+pub fn sort(ctx: Context, mut values: Vec<Val>, key_getter: FuncVal) -> Result<Vec<Val>> {
if values.len() <= 1 {
return Ok(values);
}
if key_getter.is_identity() {
// Fast path, identity key getter
- let mut values = (*values).clone();
let sort_type = get_sort_type(&mut values, |k| k)?;
match sort_type {
SortKeyType::Number => values.sort_unstable_by_key(|v| match v {
@@ -69,7 +68,7 @@
}),
SortKeyType::Unknown => unreachable!(),
};
- Ok(Cc::new(values))
+ Ok(values)
} else {
// Slow path, user provided key getter
let mut vk = Vec::with_capacity(values.len());
@@ -96,7 +95,7 @@
}),
SortKeyType::Unknown => unreachable!(),
};
- Ok(Cc::new(vk.into_iter().map(|v| v.0).collect()))
+ Ok(vk.into_iter().map(|v| v.0).collect())
}
}
@@ -106,9 +105,9 @@
if arr.len() <= 1 {
return Ok(arr);
}
- Ok(ArrValue::eager(super::sort::sort(
+ Ok(ArrValue::eager(Cc::new(super::sort::sort(
ctx,
- arr.evaluatedcc()?,
+ arr.iter().collect::<Result<Vec<_>>>()?,
keyF.unwrap_or_else(FuncVal::identity),
- )?))
+ )?)))
}
crates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -6,7 +6,6 @@
val::{ArrValue, StrValue},
Either, IStr, Val,
};
-use jrsonnet_gcmodule::Cc;
#[builtin]
pub const fn builtin_codepoint(str: char) -> Result<u32> {
@@ -31,7 +30,7 @@
#[builtin]
pub fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> Result<VecVal> {
use Either2::*;
- Ok(VecVal(Cc::new(match maxsplits {
+ Ok(VecVal(match maxsplits {
A(n) => str
.splitn(n + 1, &c as &str)
.map(|s| Val::Str(StrValue::Flat(s.into())))
@@ -40,7 +39,7 @@
.split(&c as &str)
.map(|s| Val::Str(StrValue::Flat(s.into())))
.collect(),
- })))
+ }))
}
#[builtin]
flake.lockdiffbeforeafterboth--- a/flake.lock
+++ b/flake.lock
@@ -15,28 +15,13 @@
"type": "github"
}
},
- "flake-utils_2": {
- "locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1668090223,
- "narHash": "sha256-Bynlfyf/LsQJ+CJ//1TGmA7eiCzqk95bz+bxyP39xYY=",
+ "lastModified": 1670089411,
+ "narHash": "sha256-iiW+L7iN8At8s98qb2h1P8Z0BVTZLqY8KHpfZuM7ULQ=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "1f6b98281191b50ba987cabd5bf3068870c26789",
+ "rev": "ffa4eb958a435e9833bda0fdfc834e87232aa879",
"type": "github"
},
"original": {
@@ -45,22 +30,6 @@
"type": "github"
}
},
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1665296151,
- "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"root": {
"inputs": {
"flake-utils": "flake-utils",
@@ -70,15 +39,19 @@
},
"rust-overlay": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "flake-utils": [
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1668048396,
- "narHash": "sha256-SUWQlSa/H5XKPeuF9XmWzmwIJrgK42Lak6/1jBAwyd0=",
+ "lastModified": 1670034122,
+ "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "859fefb532bb957f51a9b5e8e3ba2e48394c9353",
+ "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65",
"type": "github"
},
"original": {
flake.nixdiffbeforeafterboth--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,11 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
- rust-overlay.url = "github:oxalica/rust-overlay";
+ rust-overlay = {
+ url = "github:oxalica/rust-overlay";
+ inputs.nixpkgs.follows = "nixpkgs";
+ inputs.flake-utils.follows = "flake-utils";
+ };
};
outputs = { nixpkgs, flake-utils, rust-overlay, ... }:
flake-utils.lib.eachDefaultSystem (system:
@@ -12,7 +16,7 @@
inherit system;
overlays = [ rust-overlay.overlays.default ];
};
- rust = ((pkgs.rustChannelOf { date = "2022-11-10"; channel = "nightly"; }).default.override {
+ rust = ((pkgs.rustChannelOf { date = "2022-11-19"; channel = "nightly"; }).default.override {
extensions = [ "rust-src" "miri" ];
});
in
@@ -29,6 +33,13 @@
cargo = rust;
};
};
+ jrsonnet-nightly = pkgs.callPackage ./nix/jrsonnet.nix {
+ rustPlatform = pkgs.makeRustPlatform {
+ rustc = rust;
+ cargo = rust;
+ };
+ withNightlyFeatures = true;
+ };
jrsonnet-release = pkgs.callPackage ./nix/jrsonnet-release.nix {
rustPlatform = pkgs.makeRustPlatform {
rustc = rust;
@@ -37,29 +48,48 @@
};
benchmarks = pkgs.callPackage ./nix/benchmarks.nix {
- inherit go-jsonnet sjsonnet jsonnet jrsonnet jrsonnet-release;
+ inherit go-jsonnet sjsonnet jsonnet;
+ jrsonnetVariants = [
+ { drv = jrsonnet; name = "current"; }
+ { drv = jrsonnet-nightly; name = "current-nightly"; }
+ ];
};
benchmarks-quick = pkgs.callPackage ./nix/benchmarks.nix {
- inherit go-jsonnet sjsonnet jsonnet jrsonnet jrsonnet-release;
+ inherit go-jsonnet sjsonnet jsonnet;
quick = true;
+ jrsonnetVariants = [
+ { drv = jrsonnet; name = "current"; }
+ { drv = jrsonnet-nightly; name = "current-nightly"; }
+ ];
};
benchmarks-against-release = pkgs.callPackage ./nix/benchmarks.nix {
- inherit go-jsonnet sjsonnet jsonnet jrsonnet jrsonnet-release;
- againstRelease = true;
+ inherit go-jsonnet sjsonnet jsonnet;
+ jrsonnetVariants = [
+ { drv = jrsonnet; name = "current"; }
+ { drv = jrsonnet-nightly; name = "current-nightly"; }
+ { drv = jrsonnet-release; name = "before-str-extend"; }
+ ];
};
benchmarks-quick-against-release = pkgs.callPackage ./nix/benchmarks.nix {
- inherit go-jsonnet sjsonnet jsonnet jrsonnet jrsonnet-release;
+ inherit go-jsonnet sjsonnet jsonnet;
quick = true;
- againstRelease = true;
+ jrsonnetVariants = [
+ { drv = jrsonnet; name = "current"; }
+ { drv = jrsonnet-nightly; name = "current-nightly"; }
+ { drv = jrsonnet-release; name = "before-str-extend"; }
+ ];
};
};
devShell = pkgs.mkShell {
nativeBuildInputs = with pkgs;[
rust
cargo-edit
+ cargo-asm
lld
hyperfine
valgrind
+ kcachegrind
+ graphviz
];
};
}
nix/benchmarks.nixdiffbeforeafterboth--- a/nix/benchmarks.nix
+++ b/nix/benchmarks.nix
@@ -4,15 +4,16 @@
, cacert
, stdenv
, fetchFromGitHub
-, jrsonnet
-, jrsonnet-release
, go-jsonnet
, sjsonnet
, jsonnet
, hyperfine
, quick ? false
-, againstRelease ? false
+, jrsonnetVariants
}:
+
+with lib;
+
let
jsonnetBench = fetchFromGitHub {
rev = "v0.19.1";
@@ -65,13 +66,12 @@
unpackPhase = "true";
buildInputs = [
- jrsonnet
go-jsonnet
sjsonnet
jsonnet
hyperfine
- ] ++ (if againstRelease then [ jrsonnet-release ] else [ ]);
+ ];
installPhase =
let
@@ -81,47 +81,48 @@
echo >> $out
echo "### ${name}" >> $out
echo >> $out
- ${if skipGo != "" then ''
+ ${optionalString (skipGo != "") ''
echo "> Note: No results for Go, ${skipGo}" >> $out
echo >> $out
- '' else ""}
- ${if skipScala != "" then ''
+ ''}
+ ${optionalString (skipScala != "") ''
echo "> Note: No results for Scala, ${skipScala}" >> $out
echo >> $out
- '' else ""}
- ${if skipCpp != "" then ''
+ ''}
+ ${optionalString (skipCpp != "") ''
echo "> Note: No results for C++, ${skipCpp}" >> $out
echo >> $out
- '' else ""}
- ${if !quick then ''
+ ''}
+ ${optionalString (!quick && !omitSource) ''
echo "<details>" >> $out
echo "<summary>Source</summary>" >> $out
echo >> $out
echo "\`\`\`jsonnet" >> $out
- ${if pathIsGenerator then "echo \"// Generator source\" >> $out" else ""}
- ${if omitSource then "echo \"// Omitted: too large\" >> $out" else "cat ${path} >> $out"}
+ ${optionalString pathIsGenerator "echo \"// Generator source\" >> $out"}
+ cat ${path} >> $out
echo >> $out
echo "\`\`\`" >> $out
echo "</details>" >> $out
echo >> $out
- '' else ""}
+ ''}
path=${path}
- ${if pathIsGenerator then ''
- jrsonnet $path > generated.jsonnet
+ ${optionalString pathIsGenerator ''
+ go-jsonnet $path > generated.jsonnet
path=generated.jsonnet
- '' else ""}
- hyperfine -N -w4 --output=pipe --style=basic --export-markdown result.md \
- "jrsonnet $path ${if vendor != "" then "-J${vendor}" else ""}" -n "Rust" \
- ${if againstRelease then "\"jrsonnet-release $path ${if vendor != "" then "-J${vendor}" else ""}\" -n \"Rust (released)\"" else "" } \
- ${if skipGo == "" then "\"go-jsonnet $path ${if vendor != "" then "-J ${vendor}" else ""}\" -n \"Go\"" else "" } \
- ${if skipScala == "" then "\"sjsonnet $path ${if vendor != "" then "-J ${vendor}" else ""}\" -n \"Scala\"" else "" } \
- ${if skipCpp == "" then "\"jsonnet $path ${if vendor != "" then "-J ${vendor}" else ""}\" -n \"C++\"" else "" }
+ ''}
+ hyperfine -N -w4 -m20 --output=pipe --style=basic --export-markdown result.md \
+ ${concatStringsSep " " (forEach jrsonnetVariants (variant:
+ "\"${variant.drv}/bin/jrsonnet $path ${optionalString (vendor != "") "-J${vendor}"}\" -n \"Rust (${variant.name})\""
+ ))} \
+ ${optionalString (skipGo == "") "\"go-jsonnet $path ${optionalString (vendor != "") "-J ${vendor}"}\" -n \"Go\""} \
+ ${optionalString (skipScala == "") "\"sjsonnet $path ${optionalString (vendor != "") "-J ${vendor}"}\" -n \"Scala\""} \
+ ${optionalString (skipCpp == "") "\"jsonnet $path ${optionalString (vendor != "") "-J ${vendor}"}\" -n \"C++\""}
cat result.md >> $out
'';
in
''
touch $out
- ${if !quick then ''
+ ${optionalString (!quick) ''
cat ${./benchmarks.md} >> $out
echo >> $out
@@ -156,43 +157,43 @@
echo >> $out
echo >> $out
- '' else ""}
+ ''}
echo "## Real world" >> $out
- ${mkBench {name = "Graalvm CI"; path = "${graalvmBench}/ci.jsonnet"; skipCpp = "takes longer than a hour";}}
- ${mkBench {name = "Kube-prometheus manifests"; vendor = "${kubePrometheusBench}/vendor"; path = "${kubePrometheusBench}/example.jsonnet"; skipCpp = skipSlow;}}
+ ${mkBench {name = "Graalvm CI"; path = "${graalvmBench}/ci.jsonnet"; skipCpp = "takes longer than a hour"; skipGo = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "Kube-prometheus manifests"; vendor = "${kubePrometheusBench}/vendor"; path = "${kubePrometheusBench}/example.jsonnet"; skipCpp = skipSlow; skipGo = skipSlow; skipScala = skipSlow;}}
echo >> $out
echo "## Benchmarks from C++ jsonnet (/perf_tests)" >> $out
- ${mkBench {name = "Large string join"; path = "${jsonnetBench}/perf_tests/large_string_join.jsonnet";}}
- ${mkBench {name = "Large string template"; omitSource = true; path = "${jsonnetBench}/perf_tests/large_string_template.jsonnet"; skipGo = "fails with os stack size exhausion"; skipCpp = skipSlow;}}
- ${mkBench {name = "Realistic 1"; path = "${jsonnetBench}/perf_tests/realistic1.jsonnet"; skipGo = skipSlow; skipCpp = skipSlow;}}
- ${mkBench {name = "Realistic 2"; path = "${jsonnetBench}/perf_tests/realistic2.jsonnet"; skipGo = skipSlow; skipCpp = skipSlow;}}
+ ${mkBench {name = "Large string join"; path = "${jsonnetBench}/perf_tests/large_string_join.jsonnet"; skipScala = skipSlow;}}
+ ${mkBench {name = "Large string template"; omitSource = true; path = "${jsonnetBench}/perf_tests/large_string_template.jsonnet"; skipGo = "fails with os stack size exhausion"; skipCpp = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "Realistic 1"; path = "${jsonnetBench}/perf_tests/realistic1.jsonnet"; skipGo = skipSlow; skipCpp = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "Realistic 2"; path = "${jsonnetBench}/perf_tests/realistic2.jsonnet"; skipGo = skipSlow; skipCpp = skipSlow; skipScala = skipSlow;}}
echo >> $out
echo "## Benchmarks from C++ jsonnet (/benchmarks)" >> $out
- ${mkBench {name = "Tail call"; path = "${jsonnetBench}/benchmarks/bench.01.jsonnet";}}
- ${mkBench {name = "Inheritance recursion"; path = "${jsonnetBench}/benchmarks/bench.02.jsonnet"; skipCpp = skipSlow;}}
- ${mkBench {name = "Simple recursive call"; path = "${jsonnetBench}/benchmarks/bench.03.jsonnet";}}
- ${mkBench {name = "Foldl string concat"; path = "${jsonnetBench}/benchmarks/bench.04.jsonnet";}}
+ ${mkBench {name = "Tail call"; path = "${jsonnetBench}/benchmarks/bench.01.jsonnet"; skipScala = skipSlow;}}
+ ${mkBench {name = "Inheritance recursion"; path = "${jsonnetBench}/benchmarks/bench.02.jsonnet"; skipCpp = skipSlow; skipGo = skipSlow;}}
+ ${mkBench {name = "Simple recursive call"; path = "${jsonnetBench}/benchmarks/bench.03.jsonnet"; skipScala = skipSlow; skipGo = skipSlow;}}
+ ${mkBench {name = "Foldl string concat"; path = "${jsonnetBench}/benchmarks/bench.04.jsonnet"; skipCpp = skipSlow; skipScala = skipSlow;}}
${mkBench {name = "Array sorts"; path = "${jsonnetBench}/benchmarks/bench.06.jsonnet"; skipScala = "std.reverse is not implemented"; skipCpp = skipSlow;}}
- ${mkBench {name = "Lazy array"; path = "${jsonnetBench}/benchmarks/bench.07.jsonnet";}}
- ${mkBench {name = "Inheritance function recursion"; path = "${jsonnetBench}/benchmarks/bench.08.jsonnet";}}
- ${mkBench {name = "String strips"; path = "${jsonnetBench}/benchmarks/bench.09.jsonnet"; skipCpp = skipSlow;}}
- ${mkBench {name = "Big object"; path = "${jsonnetBench}/benchmarks/gen_big_object.jsonnet"; pathIsGenerator = true;}}
+ ${mkBench {name = "Lazy array"; path = "${jsonnetBench}/benchmarks/bench.07.jsonnet"; skipGo = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "Inheritance function recursion"; path = "${jsonnetBench}/benchmarks/bench.08.jsonnet"; skipCpp = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "String strips"; path = "${jsonnetBench}/benchmarks/bench.09.jsonnet"; skipCpp = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "Big object"; path = "${jsonnetBench}/benchmarks/gen_big_object.jsonnet"; pathIsGenerator = true; skipScala = skipSlow;}}
echo >> $out
echo "## Benchmarks from Go jsonnet (builtins)" >> $out
- ${mkBench {name = "std.base64"; path = "${goJsonnetBench}/base64.jsonnet"; skipCpp = skipSlow;}}
- ${mkBench {name = "std.base64Decode"; path = "${goJsonnetBench}/base64Decode.jsonnet"; skipCpp = skipSlow;}}
- ${mkBench {name = "std.base64DecodeBytes"; path = "${goJsonnetBench}/base64DecodeBytes.jsonnet"; skipCpp = skipSlow;}}
- ${mkBench {name = "std.base64 (byte array)"; path = "${goJsonnetBench}/base64_byte_array.jsonnet"; skipCpp = skipSlow;}}
- ${mkBench {name = "std.foldl"; path = "${goJsonnetBench}/foldl.jsonnet";}}
- ${mkBench {name = "std.manifestJsonEx"; path = "${goJsonnetBench}/manifestJsonEx.jsonnet";}}
- ${mkBench {name = "std.manifestTomlEx"; path = "${goJsonnetBench}/manifestTomlEx.jsonnet"; skipScala = "std.manifestTomlEx is not implemented";}}
- ${mkBench {name = "std.parseInt"; path = "${goJsonnetBench}/parseInt.jsonnet";}}
- ${mkBench {name = "std.reverse"; path = "${goJsonnetBench}/reverse.jsonnet"; skipScala = "std.reverse is not implemented";}}
- ${mkBench {name = "std.substr"; path = "${goJsonnetBench}/substr.jsonnet";}}
+ ${mkBench {name = "std.base64"; path = "${goJsonnetBench}/base64.jsonnet"; skipCpp = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "std.base64Decode"; path = "${goJsonnetBench}/base64Decode.jsonnet"; skipCpp = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "std.base64DecodeBytes"; path = "${goJsonnetBench}/base64DecodeBytes.jsonnet"; skipCpp = skipSlow; skipGo = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "std.base64 (byte array)"; path = "${goJsonnetBench}/base64_byte_array.jsonnet"; skipCpp = skipSlow; skipGo = skipSlow; skipScala = skipSlow;}}
+ ${mkBench {name = "std.foldl"; path = "${goJsonnetBench}/foldl.jsonnet"; skipScala = skipSlow;}}
+ ${mkBench {name = "std.manifestJsonEx"; path = "${goJsonnetBench}/manifestJsonEx.jsonnet"; skipScala = skipSlow; skipCpp = skipSlow;}}
+ ${mkBench {name = "std.manifestTomlEx"; path = "${goJsonnetBench}/manifestTomlEx.jsonnet"; skipScala = "std.manifestTomlEx is not implemented"; skipCpp=skipSlow;}}
+ ${mkBench {name = "std.parseInt"; path = "${goJsonnetBench}/parseInt.jsonnet"; skipScala = skipSlow; skipCpp = skipSlow;}}
+ ${mkBench {name = "std.reverse"; path = "${goJsonnetBench}/reverse.jsonnet"; skipScala = "std.reverse is not implemented"; skipCpp = skipSlow; skipGo = skipSlow;}}
+ ${mkBench {name = "std.substr"; path = "${goJsonnetBench}/substr.jsonnet"; skipScala = skipSlow;}}
${mkBench {name = "Comparsion for array"; path = "${goJsonnetBench}/comparison.jsonnet"; skipScala = "array comparsion is not implemented"; skipCpp = skipSlow;}}
- ${mkBench {name = "Comparsion for primitives"; path = "${goJsonnetBench}/comparison2.jsonnet"; skipCpp = "can't run: uses up to 192GB of RAM";}}
+ ${mkBench {name = "Comparsion for primitives"; path = "${goJsonnetBench}/comparison2.jsonnet"; skipCpp = "can't run: uses up to 192GB of RAM"; skipGo = skipSlow; skipScala = skipSlow;}}
'';
}
nix/jrsonnet-release.nixdiffbeforeafterboth--- a/nix/jrsonnet-release.nix
+++ b/nix/jrsonnet-release.nix
@@ -3,15 +3,15 @@
rustPlatform.buildRustPackage rec {
pname = "jrsonnet";
- version = "d32fe45b8ed28fb39b5359a704922922368af1c0";
+ version = "before-str-extend";
src = fetchFromGitHub {
owner = "CertainLach";
repo = pname;
- rev = version;
+ rev = "d32fe45b8ed28fb39b5359a704922922368af1c0";
hash = "sha256-R9Xt36bYS5upVDzt8hEifwmfocXpJbIKwvxkoJNEGVc=";
};
- cargoHash = "sha256-V+KGWeNlUnelofaGzufNPLGDyxazoFrjZ/n391VYYws=";
+ cargoHash = "sha256-j2sUIzvK66jn8ajmMsXXHstw79jCLog93XCQj1qjAN8=";
cargoTestFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ];
cargoBuildFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ];
@@ -19,7 +19,6 @@
buildInputs = [ makeWrapper ];
postInstall = ''
- mv $out/bin/jrsonnet $out/bin/jrsonnet-release
- wrapProgram $out/bin/jrsonnet-release --add-flags "--max-stack=200000 --os-stack=200000"
+ wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"
'';
}
nix/jrsonnet.nixdiffbeforeafterboth--- a/nix/jrsonnet.nix
+++ b/nix/jrsonnet.nix
@@ -1,4 +1,12 @@
-{ lib, fetchFromGitHub, rustPlatform, runCommand, makeWrapper }:
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, runCommand
+, makeWrapper
+, withNightlyFeatures ? false
+}:
+
+with lib;
let
filteredSrc = builtins.path {
@@ -18,10 +26,12 @@
rustPlatform.buildRustPackage rec {
inherit src;
pname = "jrsonnet";
- version = "git";
+ version = "current${optionalString withNightlyFeatures "-nightly"}";
- cargoTestFlags = [ "--features=mimalloc,legacy-this-file,nightly" ];
- cargoBuildFlags = [ "--features=mimalloc,legacy-this-file,nightly" ];
+ cargoTestFlags = [
+ "--features=mimalloc,legacy-this-file${optionalString withNightlyFeatures ",nightly"}"
+ ];
+ cargoBuildFlags = cargoTestFlags;
buildInputs = [ makeWrapper ];