`712f0045bec7`

diff tree log

--exec should use toString format instead of standard json

2 files changed

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

1use clap::Clap;1use clap::Clap;
2use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};2use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};
3use jrsonnet_evaluator::{error::LocError, EvaluationState};3use jrsonnet_evaluator::{error::LocError, EvaluationState, ManifestFormat};
4use std::{4use std::{
5	fs::{create_dir_all, File},5	fs::{create_dir_all, File},
6	io::Write,6	io::Write,
79	opts.manifest.configure(&state)?;79	opts.manifest.configure(&state)?;
8080
81	let val = if opts.input.exec {81	let val = if opts.input.exec {
82		state.set_manifest_format(ManifestFormat::ToString);
82		state.evaluate_snippet_raw(83		state.evaluate_snippet_raw(
83			Rc::new(PathBuf::from("args")),84			Rc::new(PathBuf::from("args")),
84			(&opts.input.input as &str).into(),85			(&opts.input.input as &str).into(),

modifiedcrates/jrsonnet-evaluator/src/val.rsdiff before after both

201	YamlStream(Box<ManifestFormat>),201	YamlStream(Box<ManifestFormat>),
202	Yaml(usize),202	Yaml(usize),
203	Json(usize),203	Json(usize),
204	ToString,
204	String,205	String,
205}206}
206207
357			}358			}
358			ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,359			ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,
359			ManifestFormat::Json(padding) => self.to_json(*padding)?,360			ManifestFormat::Json(padding) => self.to_json(*padding)?,
361			ManifestFormat::ToString => self.to_string()?,
360			ManifestFormat::String => match self {362			ManifestFormat::String => match self {
361				Self::Str(s) => s.clone(),363				Self::Str(s) => s.clone(),
362				_ => throw!(StringManifestOutputIsNotAString),364				_ => throw!(StringManifestOutputIsNotAString),