difftreelog
fix experimental build
in: master
4 files changed
crates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth110 fn get(self: Box<Self>) -> Result<Self::Output> {110 fn get(self: Box<Self>) -> Result<Self::Output> {111 let full = self.full.evaluate()?;111 let full = self.full.evaluate()?;112 let to = full.len() - self.end;112 let to = full.len() - self.end;113 Ok(Val::Arr(113 Ok(Val::Arr(full.slice(Some(self.start as i32), Some(to as i32), None)))114 full.slice(Some(self.start), Some(to), None)115 .expect("arguments checked"),116 ))117 }114 }118 }115 }crates/jrsonnet-stdlib/src/manifest/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/manifest/mod.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/mod.rs
@@ -10,8 +10,8 @@
};
pub use python::{PythonFormat, PythonVarsFormat};
pub use toml::TomlFormat;
+pub use xml::XmlJsonmlFormat;
pub use yaml::YamlFormat;
-pub use xml::XmlJsonmlFormat;
#[builtin]
pub fn builtin_escape_string_json(str_: IStr) -> Result<String> {
@@ -150,12 +150,30 @@
}
#[builtin]
-pub fn builtin_manifest_python(v: Val) -> Result<String> {
- v.manifest(PythonFormat {})
+pub fn builtin_manifest_python(
+ v: Val,
+
+ #[default(false)]
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order: bool,
+) -> Result<String> {
+ v.manifest(PythonFormat::std(
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order,
+ ))
}
#[builtin]
-pub fn builtin_manifest_python_vars(v: Val) -> Result<String> {
- v.manifest(PythonVarsFormat {})
+pub fn builtin_manifest_python_vars(
+ v: Val,
+
+ #[default(false)]
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order: bool,
+) -> Result<String> {
+ v.manifest(PythonVarsFormat::std(
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order,
+ ))
}
#[builtin]
crates/jrsonnet-stdlib/src/manifest/python.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/manifest/python.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/python.rs
@@ -9,6 +9,15 @@
preserve_order: bool,
}
+impl PythonFormat {
+ pub fn std(#[cfg(feature = "exp-preserve-order")] preserve_order: bool) -> Self {
+ Self {
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order,
+ }
+ }
+}
+
impl ManifestFormat for PythonFormat {
fn manifest_buf(&self, val: Val, buf: &mut String) -> Result<()> {
match val {
@@ -17,6 +26,8 @@
Val::Null => buf.push_str("None"),
Val::Str(s) => escape_string_json_buf(&s.to_string(), buf),
Val::Num(_) => ToStringFormat.manifest_buf(val, buf)?,
+ #[cfg(feature = "exp-bigint")]
+ Val::BigInt(_) => ToStringFormat.manifest_buf(val, buf)?,
Val::Arr(arr) => {
buf.push('[');
for (i, el) in arr.iter().enumerate() {
@@ -57,7 +68,14 @@
preserve_order: bool,
}
-impl PythonVarsFormat {}
+impl PythonVarsFormat {
+ pub fn std(#[cfg(feature = "exp-preserve-order")] preserve_order: bool) -> Self {
+ Self {
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order,
+ }
+ }
+}
impl ManifestFormat for PythonVarsFormat {
fn manifest_buf(&self, val: Val, buf: &mut String) -> Result<()> {
crates/jrsonnet-stdlib/src/manifest/xml.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/manifest/xml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/xml.rs
@@ -95,7 +95,11 @@
buf.push('<');
buf.push_str(&tag);
attrs.run_assertions()?;
- for (key, value) in attrs.iter() {
+ for (key, value) in attrs.iter(
+ // Not much sense to preserve order here
+ #[cfg(feature = "exp-preserve-order")]
+ false,
+ ) {
buf.push(' ');
buf.push_str(&key);
buf.push('=');