git.delta.rocks / jrsonnet / refs/commits / 609e5ef85d49

difftreelog

fix fully qualified struct paths in Either!

Yaroslav Bolyukin2023-08-25parent: #6e6d01b.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
511);511);
512#[macro_export]512#[macro_export]
513macro_rules! Either {513macro_rules! Either {
514 ($a:ty) => {Either1<$a>};514 ($a:ty) => {$crate::typed::Either1<$a>};
515 ($a:ty, $b:ty) => {Either2<$a, $b>};515 ($a:ty, $b:ty) => {$crate::typed::Either2<$a, $b>};
516 ($a:ty, $b:ty, $c:ty) => {Either3<$a, $b, $c>};516 ($a:ty, $b:ty, $c:ty) => {$crate::typed::Either3<$a, $b, $c>};
517 ($a:ty, $b:ty, $c:ty, $d:ty) => {Either4<$a, $b, $c, $d>};517 ($a:ty, $b:ty, $c:ty, $d:ty) => {$crate::typed::Either4<$a, $b, $c, $d>};
518 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty) => {Either5<$a, $b, $c, $d, $e>};518 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty) => {$crate::typed::Either5<$a, $b, $c, $d, $e>};
519 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty) => {Either6<$a, $b, $c, $d, $e, $f>};519 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty) => {$crate::typed::Either6<$a, $b, $c, $d, $e, $f>};
520 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty, $g:ty) => {Either7<$a, $b, $c, $d, $e, $f, $g>};520 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty, $g:ty) => {$crate::typed::Either7<$a, $b, $c, $d, $e, $f, $g>};
521}521}
522pub use Either;522pub use Either;
523523
modifiedcrates/jrsonnet-stdlib/src/misc.rsdiffbeforeafterboth
64 match &str {64 match &str {
65 Val::Str(s) => s.clone().into_flat(),65 Val::Str(s) => s.clone().into_flat(),
66 Val::Func(f) => format!("{f:?}").into(),66 Val::Func(f) => format!("{f:?}").into(),
67 v => v67 v => v.manifest(JsonFormat::debug())?.into(),
68 .manifest(JsonFormat::std_to_json(
69 String::from(" "),
70 "\n",
71 ": ",
72 #[cfg(feature = "exp-preserve-order")]
73 true,
74 ))?
75 .into(),
76 },68 },