git.delta.rocks / jrsonnet / refs/commits / a8de1ded43ea

difftreelog

build use `workspace.dependencies`

Yaroslav Bolyukin2022-10-26parent: #fe52b32.patch.diff
in: master

16 files changed

modifiedCargo.lockdiffbeforeafterboth
2525
26[[package]]26[[package]]
27name = "anyhow"27name = "anyhow"
28version = "1.0.57"28version = "1.0.66"
29source = "registry+https://github.com/rust-lang/crates.io-index"29source = "registry+https://github.com/rust-lang/crates.io-index"
30checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"30checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
3131
32[[package]]32[[package]]
33name = "atty"33name = "atty"
4848
49[[package]]49[[package]]
50name = "base64"50name = "base64"
51version = "0.13.0"51version = "0.13.1"
52source = "registry+https://github.com/rust-lang/crates.io-index"52source = "registry+https://github.com/rust-lang/crates.io-index"
53checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"53checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
5454
55[[package]]55[[package]]
56name = "bincode"56name = "bincode"
8787
88[[package]]88[[package]]
89name = "clap"89name = "clap"
90version = "3.2.8"90version = "4.0.18"
91source = "registry+https://github.com/rust-lang/crates.io-index"91source = "registry+https://github.com/rust-lang/crates.io-index"
92checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83"92checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b"
93dependencies = [93dependencies = [
94 "atty",94 "atty",
95 "bitflags",95 "bitflags",
96 "clap_derive",96 "clap_derive",
97 "clap_lex",97 "clap_lex",
98 "indexmap",
99 "once_cell",98 "once_cell",
100 "strsim",99 "strsim",
101 "termcolor",100 "termcolor",
102 "textwrap",
103]101]
104102
105[[package]]103[[package]]
106name = "clap_complete"104name = "clap_complete"
107version = "3.2.3"105version = "4.0.3"
108source = "registry+https://github.com/rust-lang/crates.io-index"106source = "registry+https://github.com/rust-lang/crates.io-index"
109checksum = "ead064480dfc4880a10764488415a97fdd36a4cf1bb022d372f02e8faf8386e1"107checksum = "dfe581a2035db4174cdbdc91265e1aba50f381577f0510d0ad36c7bc59cc84a3"
110dependencies = [108dependencies = [
111 "clap",109 "clap",
112]110]
113111
114[[package]]112[[package]]
115name = "clap_derive"113name = "clap_derive"
116version = "3.2.7"114version = "4.0.18"
117source = "registry+https://github.com/rust-lang/crates.io-index"115source = "registry+https://github.com/rust-lang/crates.io-index"
118checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"116checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3"
119dependencies = [117dependencies = [
120 "heck",118 "heck",
121 "proc-macro-error",119 "proc-macro-error",
126124
127[[package]]125[[package]]
128name = "clap_lex"126name = "clap_lex"
129version = "0.2.4"127version = "0.3.0"
130source = "registry+https://github.com/rust-lang/crates.io-index"128source = "registry+https://github.com/rust-lang/crates.io-index"
131checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"129checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
132dependencies = [130dependencies = [
133 "os_str_bytes",131 "os_str_bytes",
134]132]
144142
145[[package]]143[[package]]
146name = "getrandom"144name = "getrandom"
147version = "0.2.6"145version = "0.2.8"
148source = "registry+https://github.com/rust-lang/crates.io-index"146source = "registry+https://github.com/rust-lang/crates.io-index"
149checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"147checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
150dependencies = [148dependencies = [
151 "cfg-if 1.0.0",149 "cfg-if 1.0.0",
152 "libc",150 "libc",
153 "wasi",151 "wasi",
154]152]
155
156[[package]]
157name = "hashbrown"
158version = "0.11.2"
159source = "registry+https://github.com/rust-lang/crates.io-index"
160checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
161153
162[[package]]154[[package]]
163name = "hashbrown"155name = "hashbrown"
164version = "0.12.1"156version = "0.12.3"
165source = "registry+https://github.com/rust-lang/crates.io-index"157source = "registry+https://github.com/rust-lang/crates.io-index"
166checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"158checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
167dependencies = [159dependencies = [
168 "ahash",160 "ahash",
169]161]
185177
186[[package]]178[[package]]
187name = "indexmap"179name = "indexmap"
188version = "1.8.2"180version = "1.9.1"
189source = "registry+https://github.com/rust-lang/crates.io-index"181source = "registry+https://github.com/rust-lang/crates.io-index"
190checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"182checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
191dependencies = [183dependencies = [
192 "autocfg",184 "autocfg",
193 "hashbrown 0.11.2",185 "hashbrown",
194]186]
195187
196[[package]]188[[package]]
197name = "itoa"189name = "itoa"
198version = "1.0.2"190version = "1.0.4"
199source = "registry+https://github.com/rust-lang/crates.io-index"191source = "registry+https://github.com/rust-lang/crates.io-index"
200checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"192checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
201193
202[[package]]194[[package]]
203name = "jrsonnet"195name = "jrsonnet"
204version = "0.4.2"196version = "0.5.0"
205dependencies = [197dependencies = [
206 "clap",198 "clap",
207 "clap_complete",199 "clap_complete",
215207
216[[package]]208[[package]]
217name = "jrsonnet-cli"209name = "jrsonnet-cli"
218version = "0.4.2"210version = "0.5.0"
219dependencies = [211dependencies = [
220 "clap",212 "clap",
221 "jrsonnet-evaluator",213 "jrsonnet-evaluator",
226218
227[[package]]219[[package]]
228name = "jrsonnet-evaluator"220name = "jrsonnet-evaluator"
229version = "0.4.2"221version = "0.5.0"
230dependencies = [222dependencies = [
231 "annotate-snippets",223 "annotate-snippets",
232 "anyhow",224 "anyhow",
233 "bincode",225 "bincode",
234 "hashbrown 0.12.1",226 "hashbrown",
235 "jrsonnet-gcmodule",227 "jrsonnet-gcmodule",
236 "jrsonnet-interner",228 "jrsonnet-interner",
237 "jrsonnet-macros",229 "jrsonnet-macros",
268260
269[[package]]261[[package]]
270name = "jrsonnet-interner"262name = "jrsonnet-interner"
271version = "0.4.2"263version = "0.5.0"
272dependencies = [264dependencies = [
273 "hashbrown 0.12.1",265 "hashbrown",
274 "jrsonnet-gcmodule",266 "jrsonnet-gcmodule",
275 "rustc-hash",267 "rustc-hash",
276 "serde",268 "serde",
279271
280[[package]]272[[package]]
281name = "jrsonnet-macros"273name = "jrsonnet-macros"
282version = "0.4.2"274version = "0.5.0"
283dependencies = [275dependencies = [
284 "proc-macro2",276 "proc-macro2",
285 "quote",277 "quote",
288280
289[[package]]281[[package]]
290name = "jrsonnet-parser"282name = "jrsonnet-parser"
291version = "0.4.2"283version = "0.5.0"
292dependencies = [284dependencies = [
293 "jrsonnet-gcmodule",285 "jrsonnet-gcmodule",
294 "jrsonnet-interner",286 "jrsonnet-interner",
300292
301[[package]]293[[package]]
302name = "jrsonnet-stdlib"294name = "jrsonnet-stdlib"
303version = "0.4.2"295version = "0.5.0"
304dependencies = [296dependencies = [
305 "base64",297 "base64",
306 "bincode",298 "bincode",
317309
318[[package]]310[[package]]
319name = "jrsonnet-types"311name = "jrsonnet-types"
320version = "0.4.2"312version = "0.5.0"
321dependencies = [313dependencies = [
322 "jrsonnet-gcmodule",314 "jrsonnet-gcmodule",
323 "peg",315 "peg",
324]316]
325317
326[[package]]318[[package]]
327name = "libc"319name = "libc"
328version = "0.2.126"320version = "0.2.137"
329source = "registry+https://github.com/rust-lang/crates.io-index"321source = "registry+https://github.com/rust-lang/crates.io-index"
330checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"322checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
331323
332[[package]]324[[package]]
333name = "libjsonnet"325name = "libjsonnet"
334version = "0.4.2"326version = "0.5.0"
335dependencies = [327dependencies = [
336 "jrsonnet-evaluator",328 "jrsonnet-evaluator",
337 "jrsonnet-gcmodule",329 "jrsonnet-gcmodule",
381373
382[[package]]374[[package]]
383name = "once_cell"375name = "once_cell"
384version = "1.12.0"376version = "1.15.0"
385source = "registry+https://github.com/rust-lang/crates.io-index"377source = "registry+https://github.com/rust-lang/crates.io-index"
386checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"378checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
387379
388[[package]]380[[package]]
389name = "os_str_bytes"381name = "os_str_bytes"
390version = "6.1.0"382version = "6.3.0"
391source = "registry+https://github.com/rust-lang/crates.io-index"383source = "registry+https://github.com/rust-lang/crates.io-index"
392checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"384checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
393385
394[[package]]386[[package]]
395name = "parking_lot"387name = "parking_lot"
423415
424[[package]]416[[package]]
425name = "peg"417name = "peg"
426version = "0.8.0"418version = "0.8.1"
427source = "registry+https://github.com/rust-lang/crates.io-index"419source = "registry+https://github.com/rust-lang/crates.io-index"
428checksum = "af728fe826811af3b38c37e93de6d104485953ea373d656eebae53d6987fcd2c"420checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554"
429dependencies = [421dependencies = [
430 "peg-macros",422 "peg-macros",
431 "peg-runtime",423 "peg-runtime",
432]424]
433425
434[[package]]426[[package]]
435name = "peg-macros"427name = "peg-macros"
436version = "0.8.0"428version = "0.8.1"
437source = "registry+https://github.com/rust-lang/crates.io-index"429source = "registry+https://github.com/rust-lang/crates.io-index"
438checksum = "4536be147b770b824895cbad934fccce8e49f14b4c4946eaa46a6e4a12fcdc16"430checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b"
439dependencies = [431dependencies = [
440 "peg-runtime",432 "peg-runtime",
441 "proc-macro2",433 "proc-macro2",
444436
445[[package]]437[[package]]
446name = "peg-runtime"438name = "peg-runtime"
447version = "0.8.0"439version = "0.8.1"
448source = "registry+https://github.com/rust-lang/crates.io-index"440source = "registry+https://github.com/rust-lang/crates.io-index"
449checksum = "f9b0efd3ba03c3a409d44d60425f279ec442bcf0b9e63ff4e410da31c8b0f69f"441checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739"
450442
451[[package]]443[[package]]
452name = "proc-macro-error"444name = "proc-macro-error"
474466
475[[package]]467[[package]]
476name = "proc-macro2"468name = "proc-macro2"
477version = "1.0.39"469version = "1.0.47"
478source = "registry+https://github.com/rust-lang/crates.io-index"470source = "registry+https://github.com/rust-lang/crates.io-index"
479checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"471checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
480dependencies = [472dependencies = [
481 "unicode-ident",473 "unicode-ident",
482]474]
483475
484[[package]]476[[package]]
485name = "quote"477name = "quote"
486version = "1.0.18"478version = "1.0.21"
487source = "registry+https://github.com/rust-lang/crates.io-index"479source = "registry+https://github.com/rust-lang/crates.io-index"
488checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"480checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
489dependencies = [481dependencies = [
490 "proc-macro2",482 "proc-macro2",
491]483]
504496
505[[package]]497[[package]]
506name = "ryu"498name = "ryu"
507version = "1.0.10"499version = "1.0.11"
508source = "registry+https://github.com/rust-lang/crates.io-index"500source = "registry+https://github.com/rust-lang/crates.io-index"
509checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"501checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
510502
511[[package]]503[[package]]
512name = "scopeguard"504name = "scopeguard"
516508
517[[package]]509[[package]]
518name = "serde"510name = "serde"
519version = "1.0.142"511version = "1.0.147"
520source = "registry+https://github.com/rust-lang/crates.io-index"512source = "registry+https://github.com/rust-lang/crates.io-index"
521checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2"513checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
522dependencies = [514dependencies = [
523 "serde_derive",515 "serde_derive",
524]516]
525517
526[[package]]518[[package]]
527name = "serde_derive"519name = "serde_derive"
528version = "1.0.142"520version = "1.0.147"
529source = "registry+https://github.com/rust-lang/crates.io-index"521source = "registry+https://github.com/rust-lang/crates.io-index"
530checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e"522checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
531dependencies = [523dependencies = [
532 "proc-macro2",524 "proc-macro2",
533 "quote",525 "quote",
536528
537[[package]]529[[package]]
538name = "serde_json"530name = "serde_json"
539version = "1.0.82"531version = "1.0.87"
540source = "registry+https://github.com/rust-lang/crates.io-index"532source = "registry+https://github.com/rust-lang/crates.io-index"
541checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"533checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
542dependencies = [534dependencies = [
543 "itoa",535 "itoa",
544 "ryu",536 "ryu",
559551
560[[package]]552[[package]]
561name = "smallvec"553name = "smallvec"
562version = "1.8.0"554version = "1.10.0"
563source = "registry+https://github.com/rust-lang/crates.io-index"555source = "registry+https://github.com/rust-lang/crates.io-index"
564checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"556checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
565557
566[[package]]558[[package]]
567name = "static_assertions"559name = "static_assertions"
599591
600[[package]]592[[package]]
601name = "syn"593name = "syn"
602version = "1.0.96"594version = "1.0.103"
603source = "registry+https://github.com/rust-lang/crates.io-index"595source = "registry+https://github.com/rust-lang/crates.io-index"
604checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"596checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
605dependencies = [597dependencies = [
606 "proc-macro2",598 "proc-macro2",
607 "quote",599 "quote",
627 "serde",619 "serde",
628]620]
629
630[[package]]
631name = "textwrap"
632version = "0.15.0"
633source = "registry+https://github.com/rust-lang/crates.io-index"
634checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
635621
636[[package]]622[[package]]
637name = "thiserror"623name = "thiserror"
638version = "1.0.31"624version = "1.0.37"
639source = "registry+https://github.com/rust-lang/crates.io-index"625source = "registry+https://github.com/rust-lang/crates.io-index"
640checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"626checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
641dependencies = [627dependencies = [
642 "thiserror-impl",628 "thiserror-impl",
643]629]
644630
645[[package]]631[[package]]
646name = "thiserror-impl"632name = "thiserror-impl"
647version = "1.0.31"633version = "1.0.37"
648source = "registry+https://github.com/rust-lang/crates.io-index"634source = "registry+https://github.com/rust-lang/crates.io-index"
649checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"635checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
650dependencies = [636dependencies = [
651 "proc-macro2",637 "proc-macro2",
652 "quote",638 "quote",
655641
656[[package]]642[[package]]
657name = "unicode-ident"643name = "unicode-ident"
658version = "1.0.0"644version = "1.0.5"
659source = "registry+https://github.com/rust-lang/crates.io-index"645source = "registry+https://github.com/rust-lang/crates.io-index"
660checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"646checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
661647
662[[package]]648[[package]]
663name = "unicode-width"649name = "unicode-width"
664version = "0.1.9"650version = "0.1.10"
665source = "registry+https://github.com/rust-lang/crates.io-index"651source = "registry+https://github.com/rust-lang/crates.io-index"
666checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"652checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
667653
668[[package]]654[[package]]
669name = "version_check"655name = "version_check"
673659
674[[package]]660[[package]]
675name = "wasi"661name = "wasi"
676version = "0.10.2+wasi-snapshot-preview1"662version = "0.11.0+wasi-snapshot-preview1"
677source = "registry+https://github.com/rust-lang/crates.io-index"663source = "registry+https://github.com/rust-lang/crates.io-index"
678checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"664checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
679665
680[[package]]666[[package]]
681name = "winapi"667name = "winapi"
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,16 @@
 [workspace]
+package.version = "0.5.0"
 members = ["crates/*", "bindings/jsonnet", "cmds/jrsonnet", "tests"]
 
+[workspace.dependencies]
+jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0" }
+jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0" }
+jrsonnet-parser = { path = "./crates/jrsonnet-parser", version = "0.5.0" }
+jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0" }
+jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0" }
+jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0" }
+jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0" }
+
 [profile.test]
 opt-level = 1
modifiedbindings/jsonnet/Cargo.tomldiffbeforeafterboth
--- a/bindings/jsonnet/Cargo.toml
+++ b/bindings/jsonnet/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "libjsonnet"
 description = "Rust implementation of libjsonnet.so"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"
 publish = false
 
 [dependencies]
-jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.4.2" }
-jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" }
-jrsonnet-stdlib = { path = "../../crates/jrsonnet-stdlib", version = "0.4.2" }
+jrsonnet-evaluator.workspace = true
+jrsonnet-parser.workspace = true
+jrsonnet-stdlib.workspace = true
 jrsonnet-gcmodule = { version = "0.3.4" }
 
 [lib]
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet"
 description = "Rust jsonnet implementation"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"
@@ -21,9 +21,9 @@
 legacy-this-file = ["jrsonnet-cli/legacy-this-file"]
 
 [dependencies]
-jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.4.2" }
-jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" }
-jrsonnet-cli = { path = "../../crates/jrsonnet-cli", version = "0.4.2" }
+jrsonnet-evaluator.workspace = true
+jrsonnet-parser.workspace = true
+jrsonnet-cli.workspace = true
 jrsonnet-gcmodule = { version = "0.3.4" }
 
 mimallocator = { version = "0.1.3", optional = true }
modifiedcrates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-cli/Cargo.toml
+++ b/crates/jrsonnet-cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-cli"
 description = "Utilities for building jrsonnet CLIs"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"
@@ -14,11 +14,9 @@
 legacy-this-file = ["jrsonnet-stdlib/legacy-this-file"]
 
 [dependencies]
-jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.4.2", features = [
-    "explaining-traces",
-] }
-jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" }
+jrsonnet-evaluator = { workspace = true, features = ["explaining-traces"] }
+jrsonnet-parser.workspace = true
+jrsonnet-stdlib.workspace = true
 jrsonnet-gcmodule = { version = "0.3.4" }
-jrsonnet-stdlib = { path = "../../crates/jrsonnet-stdlib", version = "0.4.2" }
 
 clap = { version = "4.0", features = ["derive"] }
modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-evaluator"
 description = "jsonnet interpreter"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"
@@ -24,10 +24,10 @@
 nightly = []
 
 [dependencies]
-jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }
-jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }
-jrsonnet-types = { path = "../jrsonnet-types", version = "0.4.2" }
-jrsonnet-macros = { path = "../jrsonnet-macros", version = "0.4.2" }
+jrsonnet-interner.workspace = true
+jrsonnet-parser.workspace = true
+jrsonnet-types.workspace = true
+jrsonnet-macros.workspace = true
 jrsonnet-gcmodule = { version = "0.3.4" }
 
 pathdiff = "0.2.1"
modifiedcrates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -32,7 +32,7 @@
 		Destruct::Array { start, rest, end } => {
 			use jrsonnet_parser::DestructRest;
 
-			use crate::{throw, val::ArrValue};
+			use crate::val::ArrValue;
 
 			#[derive(Trace)]
 			struct DataThunk {
@@ -43,8 +43,8 @@
 			impl ThunkValue for DataThunk {
 				type Output = ArrValue;
 
-				fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
-					let v = self.parent.evaluate(s)?;
+				fn get(self: Box<Self>) -> Result<Self::Output> {
+					let v = self.parent.evaluate()?;
 					let arr = match v {
 						Val::Arr(a) => a,
 						_ => throw!("expected array"),
@@ -79,9 +79,9 @@
 				impl ThunkValue for BaseThunk {
 					type Output = Val;
 
-					fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
-						let full = self.full.evaluate(s.clone())?;
-						Ok(full.get(s, self.index)?.expect("length is checked"))
+					fn get(self: Box<Self>) -> Result<Self::Output> {
+						let full = self.full.evaluate()?;
+						Ok(full.get(self.index)?.expect("length is checked"))
 					}
 				}
 				for (i, d) in start.iter().enumerate() {
@@ -108,8 +108,8 @@
 					impl ThunkValue for RestThunk {
 						type Output = Val;
 
-						fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
-							let full = self.full.evaluate(s)?;
+						fn get(self: Box<Self>) -> Result<Self::Output> {
+							let full = self.full.evaluate()?;
 							let to = full.len() - self.end;
 							Ok(Val::Arr(full.slice(Some(self.start), Some(to), None)))
 						}
@@ -140,10 +140,10 @@
 				impl ThunkValue for EndThunk {
 					type Output = Val;
 
-					fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
-						let full = self.full.evaluate(s.clone())?;
+					fn get(self: Box<Self>) -> Result<Self::Output> {
+						let full = self.full.evaluate()?;
 						Ok(full
-							.get(s, full.len() - self.end + self.index)?
+							.get(full.len() - self.end + self.index)?
 							.expect("length is checked"))
 					}
 				}
@@ -163,7 +163,7 @@
 		}
 		#[cfg(feature = "exp-destruct")]
 		Destruct::Object { fields, rest } => {
-			use crate::{obj::ObjValue, throw};
+			use crate::obj::ObjValue;
 
 			#[derive(Trace)]
 			struct DataThunk {
@@ -174,8 +174,8 @@
 			impl ThunkValue for DataThunk {
 				type Output = ObjValue;
 
-				fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
-					let v = self.parent.evaluate(s)?;
+				fn get(self: Box<Self>) -> Result<Self::Output> {
+					let v = self.parent.evaluate()?;
 					let obj = match v {
 						Val::Obj(o) => o,
 						_ => throw!("expected object"),
@@ -215,13 +215,13 @@
 				impl ThunkValue for FieldThunk {
 					type Output = Val;
 
-					fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
-						let full = self.full.evaluate(s.clone())?;
-						if let Some(field) = full.get(s.clone(), self.field)? {
+					fn get(self: Box<Self>) -> Result<Self::Output> {
+						let full = self.full.evaluate()?;
+						if let Some(field) = full.get(self.field)? {
 							Ok(field)
 						} else {
 							let (fctx, expr) = self.default.as_ref().expect("shape is checked");
-							Ok(evaluate(s, fctx.clone().unwrap(), &expr)?)
+							Ok(evaluate(fctx.clone().unwrap(), &expr)?)
 						}
 					}
 				}
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -178,7 +178,10 @@
 			}
 			Val::Obj(obj) => {
 				let mut map = serializer.serialize_map(Some(obj.len()))?;
-				for (field, value) in obj.iter() {
+				for (field, value) in obj.iter(
+					#[cfg(feature = "exp-preserve-order")]
+					true,
+				) {
 					let mut serde_error = None;
 					// TODO: rewrite using try{} after stabilization
 					State::push_description(
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -368,8 +368,14 @@
 			.map_or(false, |v| v.is_visible())
 	}
 
-	pub fn iter(&self) -> impl Iterator<Item = (IStr, Result<Val>)> + '_ {
-		let fields = self.fields();
+	pub fn iter(
+		&self,
+		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,
+	) -> impl Iterator<Item = (IStr, Result<Val>)> + '_ {
+		let fields = self.fields(
+			#[cfg(feature = "exp-preserve-order")]
+			preserve_order,
+		);
 		fields.into_iter().map(|field| {
 			(
 				field.clone(),
modifiedcrates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -625,6 +625,7 @@
 pub fn format_arr(str: &str, mut values: &[Val]) -> Result<String> {
 	let codes = parse_codes(str)?;
 	let mut out = String::new();
+	let value_count = values.len();
 
 	for code in codes {
 		match code {
@@ -673,6 +674,13 @@
 		}
 	}
 
+	if !values.is_empty() {
+		throw!(
+			"too many values to format, expected {value_count}, got {}",
+			value_count + values.len()
+		)
+	}
+
 	Ok(out)
 }
modifiedcrates/jrsonnet-interner/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-interner/Cargo.toml
+++ b/crates/jrsonnet-interner/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-interner"
 description = "Jrsonnet string interning"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"
modifiedcrates/jrsonnet-interner/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-interner/src/lib.rs
+++ b/crates/jrsonnet-interner/src/lib.rs
@@ -255,9 +255,7 @@
 		let mut pool = pool.borrow_mut();
 		let entry = pool.raw_entry_mut().from_key(bytes);
 		match entry {
-			hashbrown::hash_map::RawEntryMut::Occupied(mut i) => {
-				IBytes(i.get_key_value().0.clone())
-			}
+			hashbrown::hash_map::RawEntryMut::Occupied(i) => IBytes(i.get_key_value().0.clone()),
 			hashbrown::hash_map::RawEntryMut::Vacant(e) => {
 				let (k, _) = e.insert(Inner::new_bytes(bytes), ());
 				IBytes(k.clone())
modifiedcrates/jrsonnet-macros/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-macros/Cargo.toml
+++ b/crates/jrsonnet-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jrsonnet-macros"
-version = "0.4.2"
+version.workspace = true
 edition = "2021"
 
 [lib]
modifiedcrates/jrsonnet-parser/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-parser/Cargo.toml
+++ b/crates/jrsonnet-parser/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-parser"
 description = "jsonnet language parser and AST"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"
@@ -26,7 +26,7 @@
 serde = ["dep:serde"]
 
 [dependencies]
-jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }
+jrsonnet-interner.workspace = true
 jrsonnet-gcmodule = { version = "0.3.4" }
 
 static_assertions = "1.1"
modifiedcrates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-stdlib"
 description = "jsonnet standard library packaged as crate"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"
@@ -17,9 +17,9 @@
 exp-preserve-order = ["jrsonnet-evaluator/exp-preserve-order"]
 
 [dependencies]
-jrsonnet-evaluator = { path = "../jrsonnet-evaluator", version = "0.4.2" }
-jrsonnet-macros = { path = "../jrsonnet-macros", version = "0.4.2" }
-jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }
+jrsonnet-evaluator.workspace = true
+jrsonnet-macros.workspace = true
+jrsonnet-parser.workspace = true
 jrsonnet-gcmodule = "0.3.4"
 
 # Used for stdlib AST serialization
@@ -37,5 +37,5 @@
 serde_yaml_with_quirks = "0.8.24"
 
 [build-dependencies]
-jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.4.2" }
+jrsonnet-parser.workspace = true
 structdump = { version = "0.2.0", features = ["derive"] }
modifiedcrates/jrsonnet-types/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-types/Cargo.toml
+++ b/crates/jrsonnet-types/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-types"
 description = "Jrsonnet type system definition"
-version = "0.4.2"
+version.workspace = true
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2021"