`295345aa77d8`

3 files changed

modifiedCargo.lockdiff before after both

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -148,6 +148,7 @@
  "jrsonnet-evaluator",
  "jrsonnet-parser",
  "mimallocator",
+ "thiserror",
 ]
 
 [[package]]
@@ -176,6 +177,7 @@
  "serde",
  "serde_json",
  "structdump",
+ "thiserror",
 ]
 
 [[package]]
@@ -429,6 +431,26 @@
 ]
 
 [[package]]
+name = "thiserror"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
 name = "unescape"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

modifiedcmds/jrsonnet/Cargo.tomldiff before after both

--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -19,6 +19,7 @@
 jrsonnet-cli = { path = "../../crates/jrsonnet-cli", version = "0.1.0" }
 # TODO: Fix mimalloc compile errors, and use them
 mimallocator = { version = "0.1.3", optional = true }
+thiserror = "1.0.20"
 
 [dependencies.clap]
 git = "https://github.com/clap-rs/clap"

modifiedcmds/jrsonnet/src/main.rsdiff before after both

1use clap::Clap;2use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts};3use jrsonnet_evaluator::{error::Result, EvaluationState};4use std::{path::PathBuf, rc::Rc};56#[cfg(feature = "mimalloc")]7#[global_allocator]8static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;910#[derive(Clap)]11// #[clap(help_heading = "DEBUG")]12struct DebugOpts {13	/// Required OS stack size.14	/// This shouldn't be changed unless jrsonnet is failing with stack overflow error.15	#[clap(long, name = "size")]16	pub os_stack: Option<usize>,17}1819#[derive(Clap)]20struct Opts {21	#[clap(flatten)]22	input: InputOpts,23	#[clap(flatten)]24	general: GeneralOpts,25	#[clap(flatten)]26	manifest: ManifestOpts,27	#[clap(flatten)]28	debug: DebugOpts,29}3031fn main() {32	let opts: Opts = Opts::parse();33	if let Some(size) = opts.debug.os_stack {34		std::thread::Builder::new()35			.stack_size(size * 1024 * 1024)36			.spawn(|| main_catch(opts))37			.expect("new thread spawned")38			.join()39			.expect("thread finished successfully");40	} else {41		main_catch(opts)42	}43}4445fn main_catch(opts: Opts) {46	let state = EvaluationState::default();47	if let Err(e) = main_real(&state, opts) {48		println!("{}", state.stringify_err(&e));49	}50}5152fn main_real(state: &EvaluationState, opts: Opts) -> Result<()> {53	opts.general.configure(&state)?;54	opts.manifest.configure(&state)?;5556	let val = if opts.input.exec {57		state.evaluate_snippet_raw(58			Rc::new(PathBuf::from("args")),59			(&opts.input.input as &str).into(),60		)?61	} else {62		state.evaluate_file_raw(&PathBuf::from(opts.input.input))?63	};6465	let val = state.with_tla(val)?;6667	println!("{}", state.manifest(val)?);6869	Ok(())70}

1use clap::Clap;2use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};3use jrsonnet_evaluator::{error::LocError, EvaluationState};4use std::{5	fs::{create_dir_all, File},6	io::Write,7	path::PathBuf,8	rc::Rc,9};1011#[cfg(feature = "mimalloc")]12#[global_allocator]13static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;1415#[derive(Clap)]16// #[clap(help_heading = "DEBUG")]17struct DebugOpts {18	/// Required OS stack size.19	/// This shouldn't be changed unless jrsonnet is failing with stack overflow error.20	#[clap(long, name = "size")]21	pub os_stack: Option<usize>,22}2324#[derive(Clap)]25struct Opts {26	#[clap(flatten)]27	input: InputOpts,28	#[clap(flatten)]29	general: GeneralOpts,30	#[clap(flatten)]31	manifest: ManifestOpts,32	#[clap(flatten)]33	output: OutputOpts,34	#[clap(flatten)]35	debug: DebugOpts,36}3738fn main() {39	let opts: Opts = Opts::parse();40	if let Some(size) = opts.debug.os_stack {41		std::thread::Builder::new()42			.stack_size(size * 1024 * 1024)43			.spawn(|| main_catch(opts))44			.expect("new thread spawned")45			.join()46			.expect("thread finished successfully");47	} else {48		main_catch(opts)49	}50}5152#[derive(thiserror::Error, Debug)]53enum Error {54	// Handled differently55	#[error("evaluation error")]56	Evaluation(jrsonnet_evaluator::error::LocError),57	#[error("io error")]58	Io(#[from] std::io::Error),59}60impl From<LocError> for Error {61	fn from(e: LocError) -> Self {62		Self::Evaluation(e)63	}64}6566fn main_catch(opts: Opts) {67	let state = EvaluationState::default();68	if let Err(e) = main_real(&state, opts) {69		if let Error::Evaluation(e) = e {70			println!("{}", state.stringify_err(&e));71		} else {72			println!("{}", e);73		}74	}75}7677fn main_real(state: &EvaluationState, opts: Opts) -> Result<(), Error> {78	opts.general.configure(&state)?;79	opts.manifest.configure(&state)?;8081	let val = if opts.input.exec {82		state.evaluate_snippet_raw(83			Rc::new(PathBuf::from("args")),84			(&opts.input.input as &str).into(),85		)?86	} else {87		state.evaluate_file_raw(&PathBuf::from(opts.input.input))?88	};8990	let val = state.with_tla(val)?;9192	if let Some(multi) = opts.output.multi {93		if opts.output.create_output_dirs {94			let mut dir = multi.clone();95			dir.pop();96			create_dir_all(dir)?;97		}98		for (file, data) in state.manifest_multi(val)?.iter() {99			let mut path = multi.clone();100			path.push(&file as &str);101			if opts.output.create_output_dirs {102				let mut dir = path.clone();103				dir.pop();104				create_dir_all(dir)?;105			}106			let mut file = File::create(path)?;107			write!(file, "{}", data)?;108		}109	} else if let Some(path) = opts.output.output_file {110		if opts.output.create_output_dirs {111			let mut dir = path.clone();112			dir.pop();113			create_dir_all(dir)?;114		}115		let mut file = File::create(path)?;116		write!(file, "{}", state.manifest(val)?)?;117	} else {118		println!("{}", state.manifest(val)?);119	}120121	Ok(())122}