git.delta.rocks / jrsonnet / refs/commits / 3cd4c9197033

difftreelog

style review suggestions

Yaroslav Bolyukin2021-10-25parent: #2ec9a62.patch.diff
in: master

1 file changed

modifiedcrates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth
217 }217 }
218 let item = item?;218 let item = item?;
219 buf.push('-');219 buf.push('-');
220 if let Val::Arr(a) = &item {220 match &item {
221 if !a.is_empty() {221 Val::Arr(a) if !a.is_empty() => {
222 buf.push('\n');222 buf.push('\n');
223 buf.push_str(cur_padding);223 buf.push_str(cur_padding);
224 buf.push_str(options.padding);224 buf.push_str(options.padding);
225 } else {225 }
226 buf.push(' ');226 _ => buf.push(' '),
227 }
228 } else {227 }
229 buf.push(' ');
230 }
231 let extra_padding = if let Val::Arr(a) = &item {228 let extra_padding = match &item {
232 !a.is_empty()229 Val::Arr(a) => !a.is_empty(),
233 } else if let Val::Obj(a) = &item {230 Val::Obj(o) => !o.is_empty(),
234 !a.is_empty()231 _ => false,
235 } else {
236 false
237 };232 };
238 let prev_len = cur_padding.len();233 let prev_len = cur_padding.len();
239 if extra_padding {234 if extra_padding {
240 cur_padding.push_str(options.padding);235 cur_padding.push_str(options.padding);
255 }250 }
256 escape_string_json_buf(key, buf);251 escape_string_json_buf(key, buf);
257 buf.push(':');252 buf.push(':');
258 let item = o.get(key.clone())?.expect("field exists");
259 if let Val::Arr(a) = &item {
260 if !a.is_empty() {
261 buf.push('\n');
262 buf.push_str(cur_padding);
263 buf.push_str(options.arr_element_padding);
264 } else {
265 buf.push(' ');
266 }
267 } else if let Val::Obj(o) = &item {
268 if !o.is_empty() {
269 buf.push('\n');
270 buf.push_str(cur_padding);
271 buf.push_str(options.padding);
272 } else {
273 buf.push(' ');
274 }
275 } else {
276 buf.push(' ');
277 }
278 let prev_len = cur_padding.len();253 let prev_len = cur_padding.len();
254 let item = o.get(key.clone())?.expect("field exists");
255 match &item {
279 if let Val::Arr(a) = &item {256 Val::Arr(a) if !a.is_empty() => {
257 buf.push('\n');
258 buf.push_str(cur_padding);
280 if !a.is_empty() {259 buf.push_str(options.arr_element_padding);
281 cur_padding.push_str(options.arr_element_padding);260 cur_padding.push_str(options.arr_element_padding);
282 }
283 } else if let Val::Obj(a) = &item {261 }
284 if !a.is_empty() {262 Val::Obj(o) if !o.is_empty() => {
263 buf.push('\n');
264 buf.push_str(cur_padding);
265 buf.push_str(options.padding);
285 cur_padding.push_str(options.padding);266 cur_padding.push_str(options.padding);
286 }
287 };267 }
268 _ => buf.push(' '),
269 }
288 manifest_yaml_ex_buf(&item, buf, cur_padding, options)?;270 manifest_yaml_ex_buf(&item, buf, cur_padding, options)?;
289 cur_padding.truncate(prev_len);271 cur_padding.truncate(prev_len);
290 }272 }