difftreelog
test fix
in: master
6 files changed
cmds/jrsonnet-fmt/src/snapshots/jrsonnet_fmt__tests__complex_comments_snapshot.snapdiffbeforeafterboth3expression: "reformat(indoc!(\"{\n\t\t comments: {\n\t\t\t_: '',\n\t\t\t// Plain comment\n\t\t\ta: '',\n\n\t\t\t# Plain comment with empty line before\n\t\t\tb: '',\n\t\t\t/*Single-line multiline comment\n\n\t\t\t*/\n\t\t\tc: '',\n\n\t\t\t/**Single-line multiline doc comment\n\n\t\t\t*/\n\t\t\tc: '',\n\n\t\t\t/**Multiline doc\n\t\t\tComment\n\t\t\t*/\n\t\t\tc: '',\n\n\t\t\t/*\n\n\tMulti-line\n\n\tcomment\n\t\t\t*/\n\t\t\td: '',\n\n\t\t\te: '', // Inline comment\n\n\t\t\tk: '',\n\n\t\t\t// Text after everything\n\t\t },\n\t\t comments2: {\n\t\t\tk: '',\n\t\t\t// Text after everything, but no newline above\n\t\t },\n spacing: {\n a: '',\n\n b: '',\n },\n noSpacing: {\n a: '',\n b: '',\n },\n }\"))"3expression: "reformat(indoc!(\"{\n\t\t comments: {\n\t\t\t_: '',\n\t\t\t// Plain comment\n\t\t\ta: '',\n\n\t\t\t# Plain comment with empty line before\n\t\t\tb: '',\n\t\t\t/*Single-line multiline comment\n\n\t\t\t*/\n\t\t\tc: '',\n\n\t\t\t/**Single-line multiline doc comment\n\n\t\t\t*/\n\t\t\tc: '',\n\n\t\t\t/**Multiline doc\n\t\t\tComment\n\t\t\t*/\n\t\t\tc: '',\n\n\t\t\t/*\n\n\tMulti-line\n\n\tcomment\n\t\t\t*/\n\t\t\td: '',\n\n\t\t\te: '', // Inline comment\n\n\t\t\tk: '',\n\n\t\t\t// Text after everything\n\t\t },\n\t\t comments2: {\n\t\t\tk: '',\n\t\t\t// Text after everything, but no newline above\n\t\t },\n spacing: {\n a: '',\n\n b: '',\n },\n noSpacing: {\n a: '',\n b: '',\n },\n }\"))"4---4---5{5{6 comments: {6 comments: {7 _: '',7 _: '',8 // Plain comment8 // Plain comment9 a: '',9 a: '',101011 # Plain comment with empty line before11 # Plain comment with empty line before12 b: '',12 b: '',13 /* Single-line multiline comment */13 /* Single-line multiline comment */14 c: '',14 c: '',151516 /**16 /**17 * Single-line multiline doc comment17 * Single-line multiline doc comment18 */18 */19 c: '',19 c: '',202021 /**21 /**22 * Multiline doc22 * Multiline doc23 * Comment23 * Comment24 */24 */25 c: '',25 c: '',262627 /*27 /*28 Multi-line28 Multi-line292930 comment30 comment31 */31 */32 d: '',32 d: '',333334 e: '', // Inline comment34 e: '', // Inline comment353536 k: '',36 k: '',373738 // Text after everything38 // Text after everything39 },39 },40 comments2: {40 comments2: {41 k: '',41 k: '',42 // Text after everything, but no newline above42 // Text after everything, but no newline above43 },43 },44 spacing: {44 spacing: {45 a: '',45 a: '',464647 b: '',47 b: '',48 },48 },49 noSpacing: {49 noSpacing: {50 a: '',50 a: '',51 b: '',51 b: '',52 },52 },53}53}5454cmds/jrsonnet-fmt/src/tests.rsdiffbeforeafterboth1use dprint_core::formatting::PrintOptions;1use dprint_core::formatting::{PrintOptions, PrintItems};2use indoc::indoc;2use indoc::indoc;334use crate::Printable;4use crate::Printable;7 let (source, _) = jrsonnet_rowan_parser::parse(input);7 let (source, _) = jrsonnet_rowan_parser::parse(input);889 dprint_core::formatting::format(9 dprint_core::formatting::format(10 || source.print(),10 || {11 let mut out = PrintItems::new();12 source.print(&mut out);13 out14 },11 PrintOptions {15 PrintOptions {12 indent_width: 2,16 indent_width: 2,13 max_width: 100,17 max_width: 100,14 use_tabs: false,18 use_tabs: true,15 new_line_text: "\n",19 new_line_text: "\n",16 },20 },17 )21 )cmds/jrsonnet/src/main.rsdiffbeforeafterboth87 debug: DebugOpts,87 debug: DebugOpts,88}88}898990// TODO: Add unix_sigpipe = "sig_dfl"90fn main() {91fn main() {91 let opts: Opts = Opts::parse();92 let opts: Opts = Opts::parse();9293crates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth88 }88 }898990 #[test]90 #[test]91 #[should_panic]91 #[should_panic = "TruncatedFormatCode"]92 fn parse_key_missing_start() {92 fn parse_key_missing_start() {93 try_parse_mapping_key("").unwrap();93 try_parse_mapping_key("").unwrap();94 }94 }959596 #[test]96 #[test]97 #[should_panic]97 #[should_panic = "TruncatedFormatCode"]98 fn parse_key_missing_end() {98 fn parse_key_missing_end() {99 try_parse_mapping_key("( ").unwrap();99 try_parse_mapping_key("( ").unwrap();100 }100 }crates/jrsonnet-rowan-parser/src/tests.rsdiffbeforeafterboth248fn eval_simple() {248fn eval_simple() {249 let src = "local a = 1, b = 2; a + local c = 1; c";249 let src = "local a = 1, b = 2; a + local c = 1; c";250 let (node, errors) = parse(src);250 let (node, errors) = parse(src);251 assert!(errors.is_empty());251252252 dbg!(node);253 dbg!(node);253}254}tests/tests/common.rsdiffbeforeafterboth64 FuncVal::StaticBuiltin(b) => b64 FuncVal::StaticBuiltin(b) => b65 .params()65 .params()66 .iter()66 .iter()67 .map(|p| p.name().as_str().unwrap_or(&"<unnamed>").to_string())67 .map(|p| p.name().as_str().unwrap_or("<unnamed>").to_string())68 .collect(),68 .collect(),69 FuncVal::Builtin(b) => b69 FuncVal::Builtin(b) => b70 .params()70 .params()71 .iter()71 .iter()72 .map(|p| p.name().as_str().unwrap_or(&"<unnamed>").to_string())72 .map(|p| p.name().as_str().unwrap_or("<unnamed>").to_string())73 .collect(),73 .collect(),74 }74 }75}75}