git.delta.rocks / jrsonnet / refs/commits / 9070b9ae357d

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -113,15 +113,6 @@
 checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
 
 [[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
 name = "bitflags"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -483,7 +474,6 @@
 dependencies = [
  "annotate-snippets",
  "anyhow",
- "bincode",
  "derivative",
  "hashbrown 0.14.5",
  "hi-doc",
@@ -1304,6 +1294,7 @@
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "clap",
  "indexmap 2.2.6",
  "itertools",
  "proc-macro2",

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,10 +56,6 @@
 sha2 = "0.10.8"
 sha3 = "0.10.8"
 
-# Pre-parsed stdlib serialization.
-# TODO: Drop in favor of replacing std.jsonnet with full native implementation, version 2.0 of bincode is bad.
-bincode = "1.3"
-
 # Source code parsing.
 # Jrsonnet has two parsers for jsonnet - one is for execution, and another is for better parsing diagnostics/lints/LSP.
 # First (and fast one) is based on peg, second is based on rowan.

147}147}
148148
149fn main_catch(opts: Opts) -> bool {149fn main_catch(opts: Opts) -> bool {
150	let s = State::default();
151	let trace = opts.trace.trace_format();150	let trace = opts.trace.trace_format();
152	if let Err(e) = main_real(&s, opts) {151	if let Err(e) = main_real(opts) {
153		if let Error::Evaluation(e) = e {152		if let Error::Evaluation(e) = e {
154			let mut out = String::new();153			let mut out = String::new();
155			trace.write_trace(&mut out, &e).expect("format error");154			trace.write_trace(&mut out, &e).expect("format error");
162	true161	true
163}162}
164163
165fn main_real(s: &State, opts: Opts) -> Result<(), Error> {164fn main_real(opts: Opts) -> Result<(), Error> {
166	let _gc_leak_guard = opts.gc.leak_on_exit();165	let _gc_leak_guard = opts.gc.leak_on_exit();
167	let _gc_print_stats = opts.gc.stats_printer();166	let _gc_print_stats = opts.gc.stats_printer();
168	let _stack_depth_override = opts.misc.stack_size_override();167	let _stack_depth_override = opts.misc.stack_size_override();
169168
170	let import_resolver = opts.misc.import_resolver();169	let import_resolver = opts.misc.import_resolver();
171	s.set_import_resolver(import_resolver);
172
173	let std = opts.std.context_initializer()?;170	let std = opts.std.context_initializer()?;
171
174	if let Some(std) = std {172	let mut s = State::builder();
173	s.import_resolver(import_resolver).context_initializer(std);
175		s.set_context_initializer(std);174	let s = s.build();
176	}
177175
178	let input = opts.input.input.ok_or(Error::MissingInputArgument)?;176	let input = opts.input.input.ok_or(Error::MissingInputArgument)?;
179	let val = if opts.input.exec {177	let val = if opts.input.exec {
189187
190	let tla = opts.tla.tla_opts()?;188	let tla = opts.tla.tla_opts()?;
191	#[allow(unused_mut)]189	#[allow(unused_mut)]
192	let mut val = apply_tla(s.clone(), &tla, val)?;190	let mut val = apply_tla(s, &tla, val)?;
193191
194	#[cfg(feature = "exp-apply")]192	#[cfg(feature = "exp-apply")]
195	for apply in opts.input.exp_apply {193	for apply in opts.input.exp_apply {