difftreelog
feat gc options
in: master
4 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -158,6 +158,7 @@
dependencies = [
"clap",
"jrsonnet-evaluator",
+ "jrsonnet-gc",
"jrsonnet-parser",
]
cmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -1,5 +1,5 @@
use clap::{AppSettings, Clap, IntoApp};
-use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};
+use jrsonnet_cli::{ConfigureState, GcOpts, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};
use jrsonnet_evaluator::{error::LocError, EvaluationState, ManifestFormat};
use std::{
fs::{create_dir_all, File},
@@ -61,6 +61,8 @@
output: OutputOpts,
#[clap(flatten)]
debug: DebugOpts,
+ #[clap(flatten)]
+ gc: GcOpts,
}
fn main() {
@@ -114,6 +116,7 @@
}
fn main_catch(opts: Opts) -> bool {
+ let _printer = opts.gc.stats_printer();
let state = EvaluationState::default();
if let Err(e) = main_real(&state, opts) {
if let Error::Evaluation(e) = e {
@@ -127,6 +130,7 @@
}
fn main_real(state: &EvaluationState, opts: Opts) -> Result<(), Error> {
+ opts.gc.configure_global();
opts.general.configure(&state)?;
opts.manifest.configure(&state)?;
crates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-cli/Cargo.toml
+++ b/crates/jrsonnet-cli/Cargo.toml
@@ -10,6 +10,7 @@
[dependencies]
jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.6", features = ["explaining-traces"] }
jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.6" }
+jrsonnet-gc = { version = "0.4.2", features = ["derive", "unstable-config", "unstable-stats"] }
[dependencies.clap]
git = "https://github.com/clap-rs/clap"
crates/jrsonnet-cli/src/lib.rsdiffbeforeafterboth1mod ext;2mod manifest;3mod tla;4mod trace;56pub use ext::*;7pub use manifest::*;8pub use tla::*;9pub use trace::*;1011use clap::Clap;12use jrsonnet_evaluator::{error::Result, EvaluationState, FileImportResolver};13use std::path::PathBuf;1415pub trait ConfigureState {16 fn configure(&self, state: &EvaluationState) -> Result<()>;17}1819#[derive(Clap)]20#[clap(help_heading = "INPUT")]21pub struct InputOpts {22 #[clap(23 long,24 short = 'e',25 about = "Treat input as code, evaluate them instead of reading file"26 )]27 pub exec: bool,2829 #[clap(30 about = "Path to the file to be compiled if `--evaluate` is unset, otherwise code itself"31 )]32 pub input: String,33}3435#[derive(Clap)]36#[clap(help_heading = "OPTIONS")]37pub struct MiscOpts {38 /// Disable standard library.39 /// By default standard library will be available via global `std` variable.40 /// Note that standard library will still be loaded41 /// if chosen manifestification method is not `none`.42 #[clap(long)]43 no_stdlib: bool,4445 /// Maximal allowed number of stack frames,46 /// stack overflow error will be raised if this number gets exceeded.47 #[clap(long, short = 's', default_value = "200")]48 max_stack: usize,4950 /// Library search dirs.51 /// Any not found `imported` file will be searched in these.52 /// This can also be specified via `JSONNET_PATH` variable,53 /// which should contain a colon-separated (semicolon-separated on Windows) list of directories.54 #[clap(long, short = 'J')]55 jpath: Vec<PathBuf>,56}57impl ConfigureState for MiscOpts {58 fn configure(&self, state: &EvaluationState) -> Result<()> {59 if !self.no_stdlib {60 state.with_stdlib();61 }6263 state.set_import_resolver(Box::new(FileImportResolver {64 library_paths: self.jpath.clone(),65 }));6667 state.set_max_stack(self.max_stack);68 Ok(())69 }70}7172/// General configuration of jsonnet73#[derive(Clap)]74#[clap(name = "jrsonnet", version, author)]75pub struct GeneralOpts {76 #[clap(flatten)]77 misc: MiscOpts,7879 #[clap(flatten)]80 tla: TLAOpts,81 #[clap(flatten)]82 ext: ExtVarOpts,8384 #[clap(flatten)]85 trace: TraceOpts,86}8788impl ConfigureState for GeneralOpts {89 fn configure(&self, state: &EvaluationState) -> Result<()> {90 // Configure trace first, because tla-code/ext-code can throw91 self.trace.configure(state)?;92 self.misc.configure(state)?;93 self.tla.configure(state)?;94 self.ext.configure(state)?;95 Ok(())96 }97}