difftreelog
refactor jrsonnet cli should not depend on ir
in: master
3 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2459,7 +2459,6 @@
"jrsonnet-cli",
"jrsonnet-evaluator",
"jrsonnet-gcmodule",
- "jrsonnet-ir",
"mimallocator",
"serde",
"serde_json",
cmds/jrsonnet/Cargo.tomldiffbeforeafterboth1[package]2name = "jrsonnet"3description = "Rust implementation of the jsonnet command-line interpreter"4keywords = ["jsonnet", "json", "config", "cli"]5categories = ["command-line-utilities", "config", "template-engine"]6authors.workspace = true7edition.workspace = true8license.workspace = true9repository.workspace = true10version.workspace = true11default-run = "jrsonnet"1213[lints]14workspace = true1516[features]17experimental = [18 "exp-preserve-order",19 "exp-destruct",20 "exp-null-coaelse",21 "exp-object-iteration",22 "exp-bigint",23 "exp-apply",24]25# Use mimalloc as allocator26mimalloc = ["mimallocator"]27# Experimental feature, which allows to preserve order of object fields28exp-preserve-order = [29 "jrsonnet-evaluator/exp-preserve-order",30 "jrsonnet-cli/exp-preserve-order",31]32# Destructuring of locals33exp-destruct = ["jrsonnet-evaluator/exp-destruct"]34# Iteration over objects yields [key, value] elements35exp-object-iteration = ["jrsonnet-evaluator/exp-object-iteration"]36# Bigint type37exp-bigint = ["jrsonnet-evaluator/exp-bigint", "jrsonnet-cli/exp-bigint"]38# std.regex and co.39exp-regex = ["jrsonnet-cli/exp-regex"]40# obj?.field, obj?.['field']41exp-null-coaelse = [42 "jrsonnet-evaluator/exp-null-coaelse",43 "jrsonnet-ir/exp-null-coaelse",44 "jrsonnet-cli/exp-null-coaelse",45]46# --exp-apply47exp-apply = []4849[dependencies]50jrsonnet-evaluator.workspace = true51jrsonnet-ir.workspace = true52jrsonnet-cli.workspace = true53jrsonnet-gcmodule.workspace = true5455mimallocator = { workspace = true, optional = true }56thiserror.workspace = true57clap = { workspace = true, features = ["derive"] }58clap_complete.workspace = true59serde_json.workspace = true60serde = { workspace = true, features = ["derive"] }61hi-doc.workspace = truecmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -7,10 +7,9 @@
use clap_complete::Shell;
use jrsonnet_cli::{GcOpts, ManifestOpts, MiscOpts, OutputOpts, StdOpts, TlaOpts, TraceOpts};
use jrsonnet_evaluator::{
- ResultExt, State, Val, apply_tla, bail,
+ ResultExt, SourceDefaultIgnoreJpath, SourcePath, State, Val, apply_tla, bail,
error::{Error as JrError, ErrorKind},
};
-use jrsonnet_ir::{SourceDefaultIgnoreJpath, SourcePath};
#[cfg(feature = "mimalloc")]
#[global_allocator]