From bd0db205b68407af0b4c7673862000ab8db4630e Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 23 Oct 2024 12:36:27 -0400 Subject: [PATCH 1/3] m4/tests: cargo fmt insists --- m4/tests/integration_test.rs | 152 +++++++++++++++++------------------ 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/m4/tests/integration_test.rs b/m4/tests/integration_test.rs index 8d0e51c84..e3497ec4e 100644 --- a/m4/tests/integration_test.rs +++ b/m4/tests/integration_test.rs @@ -109,7 +109,7 @@ fn run_command(input: &Path) -> std::process::Output { #[test] fn test_bsd() { init(); - let output = run_command(Path::new("fixtures/integration_tests/bsd.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/bsd.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/bsd.out"); assert_eq!( @@ -135,7 +135,7 @@ fn test_bsd() { #[test] fn test_bsd_math() { init(); - let output = run_command(Path::new("fixtures/integration_tests/bsd_math.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/bsd_math.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/bsd_math.out"); assert_eq!( @@ -160,7 +160,7 @@ fn test_bsd_math() { #[test] fn test_changecom() { init(); - let output = run_command(Path::new("fixtures/integration_tests/changecom.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/changecom.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/changecom.out"); assert_eq!( @@ -185,7 +185,7 @@ fn test_changecom() { #[test] fn test_changequote() { init(); - let output = run_command(Path::new("fixtures/integration_tests/changequote.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/changequote.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/changequote.out"); assert_eq!( @@ -210,7 +210,7 @@ fn test_changequote() { #[test] fn test_decr() { init(); - let output = run_command(Path::new("fixtures/integration_tests/decr.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/decr.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/decr.out"); assert_eq!( @@ -235,7 +235,7 @@ fn test_decr() { #[test] fn test_define() { init(); - let output = run_command(Path::new("fixtures/integration_tests/define.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/define.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/define.out"); assert_eq!( @@ -260,7 +260,7 @@ fn test_define() { #[test] fn test_define_args() { init(); - let output = run_command(Path::new("fixtures/integration_tests/define_args.args")); + let output = run_command(&Path::new("fixtures/integration_tests/define_args.args")); let test: TestSnapshot = read_test("fixtures/integration_tests/define_args.out"); assert_eq!( @@ -286,7 +286,7 @@ fn test_define_args() { #[test] fn test_define_eval_order_unquoted() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_eval_order_unquoted.m4", )); @@ -314,7 +314,7 @@ fn test_define_eval_order_unquoted() { #[test] fn test_define_eval_syntax_order_quoted_evaluated() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_eval_syntax_order_quoted_evaluated.m4", )); @@ -342,7 +342,7 @@ fn test_define_eval_syntax_order_quoted_evaluated() { #[test] fn test_define_eval_syntax_order_quoted_unevaluated() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_eval_syntax_order_quoted_unevaluated.m4", )); @@ -371,7 +371,7 @@ fn test_define_eval_syntax_order_quoted_unevaluated() { #[test] fn test_define_eval_syntax_order_unquoted() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_eval_syntax_order_unquoted.m4", )); @@ -399,7 +399,7 @@ fn test_define_eval_syntax_order_unquoted() { #[test] fn test_define_hanging_quotes() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_hanging_quotes.m4", )); @@ -426,7 +426,7 @@ fn test_define_hanging_quotes() { #[test] fn test_define_invalid_macro_name() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_invalid_macro_name.m4", )); @@ -453,7 +453,7 @@ fn test_define_invalid_macro_name() { #[test] fn test_define_iterative() { init(); - let output = run_command(Path::new("fixtures/integration_tests/define_iterative.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/define_iterative.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/define_iterative.out"); assert_eq!( @@ -478,7 +478,7 @@ fn test_define_iterative() { #[test] fn test_define_iterative_2() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_iterative_2.m4", )); @@ -505,7 +505,7 @@ fn test_define_iterative_2() { #[test] fn test_define_nested() { init(); - let output = run_command(Path::new("fixtures/integration_tests/define_nested.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/define_nested.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/define_nested.out"); assert_eq!( @@ -531,7 +531,7 @@ fn test_define_nested() { #[test] fn test_define_nested_first_arg() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_nested_first_arg.m4", )); @@ -558,7 +558,7 @@ fn test_define_nested_first_arg() { #[test] fn test_define_number_parsing() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_number_parsing.m4", )); @@ -583,7 +583,7 @@ fn test_define_number_parsing() { #[test] fn test_define_order_defined() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_order_defined.m4", )); @@ -610,7 +610,7 @@ fn test_define_order_defined() { #[test] fn test_define_order_undefined() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_order_undefined.m4", )); @@ -637,7 +637,7 @@ fn test_define_order_undefined() { #[test] fn test_define_parse_brackets() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_parse_brackets.m4", )); @@ -662,7 +662,7 @@ fn test_define_parse_brackets() { #[test] fn test_define_pushpopdef_undefine() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_pushpopdef_undefine.m4", )); @@ -689,7 +689,7 @@ fn test_define_pushpopdef_undefine() { #[test] fn test_define_quoted_number_stacked() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_quoted_number_stacked.m4", )); @@ -715,7 +715,7 @@ fn test_define_quoted_number_stacked() { #[test] fn test_define_stacked() { init(); - let output = run_command(Path::new("fixtures/integration_tests/define_stacked.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/define_stacked.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/define_stacked.out"); assert_eq!( @@ -740,7 +740,7 @@ fn test_define_stacked() { #[test] fn test_define_undefine_order() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_undefine_order.m4", )); @@ -767,7 +767,7 @@ fn test_define_undefine_order() { #[test] fn test_define_unquoted_number_arg() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/define_unquoted_number_arg.m4", )); @@ -792,7 +792,7 @@ fn test_define_unquoted_number_arg() { #[test] fn test_defn() { init(); - let output = run_command(Path::new("fixtures/integration_tests/defn.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/defn.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/defn.out"); assert_eq!( @@ -817,7 +817,7 @@ fn test_defn() { #[test] fn test_divert() { init(); - let output = run_command(Path::new("fixtures/integration_tests/divert.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/divert.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/divert.out"); assert_eq!( @@ -842,7 +842,7 @@ fn test_divert() { #[test] fn test_divert_nested() { init(); - let output = run_command(Path::new("fixtures/integration_tests/divert_nested.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/divert_nested.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/divert_nested.out"); assert_eq!( @@ -867,7 +867,7 @@ fn test_divert_nested() { #[test] fn test_divert_nested_2() { init(); - let output = run_command(Path::new("fixtures/integration_tests/divert_nested_2.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/divert_nested_2.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/divert_nested_2.out"); assert_eq!( @@ -892,7 +892,7 @@ fn test_divert_nested_2() { #[test] fn test_divert_nested_3() { init(); - let output = run_command(Path::new("fixtures/integration_tests/divert_nested_3.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/divert_nested_3.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/divert_nested_3.out"); assert_eq!( @@ -917,7 +917,7 @@ fn test_divert_nested_3() { #[test] fn test_divert_nested_4() { init(); - let output = run_command(Path::new("fixtures/integration_tests/divert_nested_4.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/divert_nested_4.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/divert_nested_4.out"); assert_eq!( @@ -942,7 +942,7 @@ fn test_divert_nested_4() { #[test] fn test_dnl() { init(); - let output = run_command(Path::new("fixtures/integration_tests/dnl.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/dnl.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/dnl.out"); assert_eq!( @@ -967,7 +967,7 @@ fn test_dnl() { #[test] fn test_dnl_nested() { init(); - let output = run_command(Path::new("fixtures/integration_tests/dnl_nested.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/dnl_nested.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/dnl_nested.out"); assert_eq!( @@ -992,7 +992,7 @@ fn test_dnl_nested() { #[test] fn test_dumpdef() { init(); - let output = run_command(Path::new("fixtures/integration_tests/dumpdef.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/dumpdef.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/dumpdef.out"); assert_eq!( @@ -1017,7 +1017,7 @@ fn test_dumpdef() { #[test] fn test_dumpdef_notexist() { init(); - let output = run_command(Path::new("fixtures/integration_tests/dumpdef_notexist.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/dumpdef_notexist.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/dumpdef_notexist.out"); assert_eq!( @@ -1040,7 +1040,7 @@ fn test_dumpdef_notexist() { #[test] fn test_eval() { init(); - let output = run_command(Path::new("fixtures/integration_tests/eval.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/eval.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/eval.out"); assert_eq!( @@ -1065,7 +1065,7 @@ fn test_eval() { #[test] fn test_evaluation_order() { init(); - let output = run_command(Path::new("fixtures/integration_tests/evaluation_order.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/evaluation_order.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/evaluation_order.out"); assert_eq!( @@ -1090,7 +1090,7 @@ fn test_evaluation_order() { #[test] fn test_file() { init(); - let output = run_command(Path::new("fixtures/integration_tests/file.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/file.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/file.out"); assert_eq!( @@ -1115,7 +1115,7 @@ fn test_file() { #[test] fn test_forloop_nested() { init(); - let output = run_command(Path::new("fixtures/integration_tests/forloop_nested.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/forloop_nested.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/forloop_nested.out"); assert_eq!( @@ -1140,7 +1140,7 @@ fn test_forloop_nested() { #[test] fn test_forloop_simple() { init(); - let output = run_command(Path::new("fixtures/integration_tests/forloop_simple.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/forloop_simple.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/forloop_simple.out"); assert_eq!( @@ -1165,7 +1165,7 @@ fn test_forloop_simple() { #[test] fn test_ifdef() { init(); - let output = run_command(Path::new("fixtures/integration_tests/ifdef.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/ifdef.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/ifdef.out"); assert_eq!( @@ -1190,7 +1190,7 @@ fn test_ifdef() { #[test] fn test_ifelse() { init(); - let output = run_command(Path::new("fixtures/integration_tests/ifelse.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/ifelse.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/ifelse.out"); assert_eq!( @@ -1215,7 +1215,7 @@ fn test_ifelse() { #[test] fn test_include() { init(); - let output = run_command(Path::new("fixtures/integration_tests/include.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/include.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/include.out"); assert_eq!( @@ -1240,7 +1240,7 @@ fn test_include() { #[test] fn test_include_divert() { init(); - let output = run_command(Path::new("fixtures/integration_tests/include_divert.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/include_divert.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/include_divert.out"); assert_eq!( @@ -1265,7 +1265,7 @@ fn test_include_divert() { #[test] fn test_incr() { init(); - let output = run_command(Path::new("fixtures/integration_tests/incr.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/incr.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/incr.out"); assert_eq!( @@ -1290,7 +1290,7 @@ fn test_incr() { #[test] fn test_index() { init(); - let output = run_command(Path::new("fixtures/integration_tests/index.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/index.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/index.out"); assert_eq!( @@ -1315,7 +1315,7 @@ fn test_index() { #[test] fn test_index_too_few_args() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/index_too_few_args.m4", )); @@ -1340,7 +1340,7 @@ fn test_index_too_few_args() { #[test] fn test_len() { init(); - let output = run_command(Path::new("fixtures/integration_tests/len.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/len.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/len.out"); assert_eq!( @@ -1365,7 +1365,7 @@ fn test_len() { #[test] fn test_m4exit_error() { init(); - let output = run_command(Path::new("fixtures/integration_tests/m4exit_error.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/m4exit_error.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/m4exit_error.out"); assert_eq!( @@ -1390,7 +1390,7 @@ fn test_m4exit_error() { #[test] fn test_m4exit_no_args() { init(); - let output = run_command(Path::new("fixtures/integration_tests/m4exit_no_args.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/m4exit_no_args.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/m4exit_no_args.out"); assert_eq!( @@ -1415,7 +1415,7 @@ fn test_m4exit_no_args() { #[test] fn test_m4exit_success() { init(); - let output = run_command(Path::new("fixtures/integration_tests/m4exit_success.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/m4exit_success.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/m4exit_success.out"); assert_eq!( @@ -1440,7 +1440,7 @@ fn test_m4exit_success() { #[test] fn test_m4wrap() { init(); - let output = run_command(Path::new("fixtures/integration_tests/m4wrap.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/m4wrap.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/m4wrap.out"); assert_eq!( @@ -1465,7 +1465,7 @@ fn test_m4wrap() { #[test] fn test_macro_errprint_evaluation() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/macro_errprint_evaluation.m4", )); @@ -1492,7 +1492,7 @@ fn test_macro_errprint_evaluation() { #[test] fn test_macro_errprint_no_evaluation() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/macro_errprint_no_evaluation.m4", )); @@ -1520,7 +1520,7 @@ fn test_macro_errprint_no_evaluation() { #[test] fn test_macro_errprint_no_evaluation_quoted() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/macro_errprint_no_evaluation_quoted.m4", )); @@ -1548,7 +1548,7 @@ fn test_macro_errprint_no_evaluation_quoted() { #[test] fn test_maketemp() { init(); - let output = run_command(Path::new("fixtures/integration_tests/maketemp.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/maketemp.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/maketemp.out"); assert_eq!( @@ -1574,7 +1574,7 @@ fn test_maketemp() { #[test] fn test_mkstemp() { init(); - let output = run_command(Path::new("fixtures/integration_tests/mkstemp.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/mkstemp.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/mkstemp.out"); assert_eq!( @@ -1600,7 +1600,7 @@ fn test_mkstemp() { #[test] fn test_quoted_nested_eof_in_string() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/quoted_nested_eof_in_string.m4", )); @@ -1626,7 +1626,7 @@ fn test_quoted_nested_eof_in_string() { #[test] fn test_recurse() { init(); - let output = run_command(Path::new("fixtures/integration_tests/recurse.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/recurse.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/recurse.out"); assert_eq!( @@ -1651,7 +1651,7 @@ fn test_recurse() { #[test] fn test_recursive_defines() { init(); - let output = run_command(Path::new( + let output = run_command(&Path::new( "fixtures/integration_tests/recursive_defines.m4", )); @@ -1678,7 +1678,7 @@ fn test_recursive_defines() { #[test] fn test_redefine_inbuilt() { init(); - let output = run_command(Path::new("fixtures/integration_tests/redefine_inbuilt.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/redefine_inbuilt.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/redefine_inbuilt.out"); assert_eq!( @@ -1703,7 +1703,7 @@ fn test_redefine_inbuilt() { #[test] fn test_reverse() { init(); - let output = run_command(Path::new("fixtures/integration_tests/reverse.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/reverse.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/reverse.out"); assert_eq!( @@ -1728,7 +1728,7 @@ fn test_reverse() { #[test] fn test_shift() { init(); - let output = run_command(Path::new("fixtures/integration_tests/shift.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/shift.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/shift.out"); assert_eq!( @@ -1753,7 +1753,7 @@ fn test_shift() { #[test] fn test_sinclude() { init(); - let output = run_command(Path::new("fixtures/integration_tests/sinclude.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/sinclude.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/sinclude.out"); assert_eq!( @@ -1778,7 +1778,7 @@ fn test_sinclude() { #[test] fn test_substr() { init(); - let output = run_command(Path::new("fixtures/integration_tests/substr.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/substr.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/substr.out"); assert_eq!( @@ -1804,7 +1804,7 @@ fn test_substr() { #[test] fn test_synclines_1() { init(); - let output = run_command(Path::new("fixtures/integration_tests/synclines_1.args")); + let output = run_command(&Path::new("fixtures/integration_tests/synclines_1.args")); let test: TestSnapshot = read_test("fixtures/integration_tests/synclines_1.out"); assert_eq!( @@ -1830,7 +1830,7 @@ fn test_synclines_1() { #[test] fn test_synclines_2() { init(); - let output = run_command(Path::new("fixtures/integration_tests/synclines_2.args")); + let output = run_command(&Path::new("fixtures/integration_tests/synclines_2.args")); let test: TestSnapshot = read_test("fixtures/integration_tests/synclines_2.out"); assert_eq!( @@ -1856,7 +1856,7 @@ fn test_synclines_2() { #[test] fn test_syscmd_sysval() { init(); - let output = run_command(Path::new("fixtures/integration_tests/syscmd_sysval.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/syscmd_sysval.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/syscmd_sysval.out"); assert_eq!( @@ -1881,7 +1881,7 @@ fn test_syscmd_sysval() { #[test] fn test_trace() { init(); - let output = run_command(Path::new("fixtures/integration_tests/trace.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/trace.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/trace.out"); assert_eq!( @@ -1906,7 +1906,7 @@ fn test_trace() { #[test] fn test_translit() { init(); - let output = run_command(Path::new("fixtures/integration_tests/translit.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/translit.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/translit.out"); assert_eq!( @@ -1931,7 +1931,7 @@ fn test_translit() { #[test] fn test_two_files() { init(); - let output = run_command(Path::new("fixtures/integration_tests/two_files.args")); + let output = run_command(&Path::new("fixtures/integration_tests/two_files.args")); let test: TestSnapshot = read_test("fixtures/integration_tests/two_files.out"); assert_eq!( @@ -1956,7 +1956,7 @@ fn test_two_files() { #[test] fn test_undivert() { init(); - let output = run_command(Path::new("fixtures/integration_tests/undivert.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/undivert.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/undivert.out"); assert_eq!( @@ -1981,7 +1981,7 @@ fn test_undivert() { #[test] fn test_undivert_2() { init(); - let output = run_command(Path::new("fixtures/integration_tests/undivert_2.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/undivert_2.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/undivert_2.out"); assert_eq!( @@ -2006,7 +2006,7 @@ fn test_undivert_2() { #[test] fn test_undivert_current() { init(); - let output = run_command(Path::new("fixtures/integration_tests/undivert_current.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/undivert_current.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/undivert_current.out"); assert_eq!( @@ -2031,7 +2031,7 @@ fn test_undivert_current() { #[test] fn test_undivert_nested() { init(); - let output = run_command(Path::new("fixtures/integration_tests/undivert_nested.m4")); + let output = run_command(&Path::new("fixtures/integration_tests/undivert_nested.m4")); let test: TestSnapshot = read_test("fixtures/integration_tests/undivert_nested.out"); assert_eq!( From 9e3342b907c041187b24487ab81eeb302d832d74 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 23 Oct 2024 12:36:41 -0400 Subject: [PATCH 2/3] m4/test-manager: correct version --- m4/test-manager/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/test-manager/Cargo.toml b/m4/test-manager/Cargo.toml index eaf1fc745..a66e083ec 100644 --- a/m4/test-manager/Cargo.toml +++ b/m4/test-manager/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "m4-test-manager" -version = "0.1.0" +version = "0.2.1" edition.workspace = true rust-version.workspace = true From 5167eeeb13ab2d1390857797baba07d3e446227e Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 23 Oct 2024 12:36:49 -0400 Subject: [PATCH 3/3] Cargo.lock: update deps --- Cargo.lock | 199 ++++++++++++++++++++++++++++------------------------- 1 file changed, 106 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b89f8b4a8..9389edf9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,14 +147,14 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] name = "binrw" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f36b7cb3ab9ff6a2858650d8dc360e783a5d14dc29594db48c56a3c233cc265" +checksum = "7d4bca59c20d6f40c2cc0802afbe1e788b89096f61bdf7aeea6bf00f10c2909b" dependencies = [ "array-init", "binrw_derive", @@ -163,9 +163,9 @@ dependencies = [ [[package]] name = "binrw_derive" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ea7a8c5c8eeffffac6d54d172444e15beffac6f817fac714460a9a9aa88da3" +checksum = "d8ba42866ce5bced2645bfa15e97eef2c62d2bdb530510538de8dd3d04efff3c" dependencies = [ "either", "owo-colors", @@ -217,7 +217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "serde", ] @@ -229,22 +229,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -255,9 +255,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.22" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "shlex", ] @@ -308,9 +308,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -318,9 +318,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstyle", "clap_lex", @@ -335,7 +335,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -456,7 +456,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -689,6 +689,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.5.0" @@ -737,12 +743,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -788,9 +794,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -896,9 +902,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[package]] +name = "libcrypt-rs" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "39b3d7c612f85d15ec030b01eb7e6e89cee1dfe04ce9ba7c09f01958f54489ac" [[package]] name = "libloading" @@ -951,7 +963,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "m4-test-manager" -version = "0.1.0" +version = "0.2.1" dependencies = [ "clap", ] @@ -1047,9 +1059,9 @@ dependencies = [ [[package]] name = "notify-debouncer-full" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" +checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e" dependencies = [ "crossbeam-channel", "file-id", @@ -1120,7 +1132,7 @@ checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "crc32fast", "flate2", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "memchr", "ruzstd", @@ -1128,9 +1140,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "option-ext" @@ -1169,9 +1181,9 @@ dependencies = [ [[package]] name = "pest" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -1180,9 +1192,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -1190,22 +1202,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] name = "pest_meta" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -1491,6 +1503,7 @@ dependencies = [ "clap", "gettext-rs", "libc", + "libcrypt-rs", "plib", "syslog", "thiserror", @@ -1524,19 +1537,19 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "910d41a655dac3b764f1ade94821093d3610248694320cd072303a8eedcf221d" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -1555,7 +1568,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -1637,9 +1650,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -1657,14 +1670,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -1678,13 +1691,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -1701,9 +1714,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rustc-hash" @@ -1726,9 +1739,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rusty-fork" @@ -1789,22 +1802,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -1887,7 +1900,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -1903,9 +1916,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -1941,9 +1954,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -1993,27 +2006,27 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -2130,9 +2143,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uname" @@ -2222,9 +2235,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -2233,24 +2246,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2258,22 +2271,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "winapi" @@ -2345,7 +2358,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -2356,7 +2369,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -2534,5 +2547,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ]