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

difftreelog

fix StateBuilder leftovers

Yaroslav Bolyukin2024-06-18parent: #bc5db17.patch.diff
in: master

3 files changed

modifiedCargo.lockdiffbeforeafterboth
112source = "registry+https://github.com/rust-lang/crates.io-index"112source = "registry+https://github.com/rust-lang/crates.io-index"
113checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"113checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
114
115[[package]]
116name = "bincode"
117version = "1.3.3"
118source = "registry+https://github.com/rust-lang/crates.io-index"
119checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
120dependencies = [
121 "serde",
122]
123114
124[[package]]115[[package]]
125name = "bitflags"116name = "bitflags"
483dependencies = [474dependencies = [
484 "annotate-snippets",475 "annotate-snippets",
485 "anyhow",476 "anyhow",
486 "bincode",
487 "derivative",477 "derivative",
488 "hashbrown 0.14.5",478 "hashbrown 0.14.5",
489 "hi-doc",479 "hi-doc",
1304version = "0.1.0"1294version = "0.1.0"
1305dependencies = [1295dependencies = [
1306 "anyhow",1296 "anyhow",
1297 "clap",
1307 "indexmap 2.2.6",1298 "indexmap 2.2.6",
1308 "itertools",1299 "itertools",
1309 "proc-macro2",1300 "proc-macro2",
modifiedCargo.tomldiffbeforeafterboth
56sha2 = "0.10.8"56sha2 = "0.10.8"
57sha3 = "0.10.8"57sha3 = "0.10.8"
58
59# Pre-parsed stdlib serialization.
60# TODO: Drop in favor of replacing std.jsonnet with full native implementation, version 2.0 of bincode is bad.
61bincode = "1.3"
6258
63# Source code parsing.59# Source code parsing.
64# Jrsonnet has two parsers for jsonnet - one is for execution, and another is for better parsing diagnostics/lints/LSP.60# Jrsonnet has two parsers for jsonnet - one is for execution, and another is for better parsing diagnostics/lints/LSP.
modifiedcmds/jrsonnet/src/main.rsdiffbeforeafterboth
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 {