diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 52af69b3470..6509e29b0c7 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -55,7 +55,7 @@ The input of the template is the canonical data from [`problem-specifications`]. Find some tips about writing tera templates [here](#tera-templates). -[Tera]: https://keats.github.io/tera/docs/ +[Tera]: https://keats.github.io/tera/ [`problem-specifications`]: https://github.com/exercism/problem-specifications/ Many aspects of a correctly implemented exercises are checked in CI. @@ -125,7 +125,7 @@ You can use an if-else to render something different, depending on the structure of the data: ```txt -let expected = {% if test.expected is object -%} +let expected = {% if test.expected is map -%} None {%- else -%} Some({{ test.expected }}) @@ -157,7 +157,7 @@ For a rather complicated example, check out the test template of `triangle`. It organizes the test cases in modules and dynamically detects which tests to put behind feature gates. That exercise also reimplements some test cases from upstream in `additional-tests.json`, in order to add more information to them necessary for generating good tests. -[tera-docs]: https://keats.github.io/tera/docs/#templates +[tera-docs]: https://keats.github.io/tera/#template ## Syllabus diff --git a/exercises/practice/affine-cipher/.meta/test_template.tera b/exercises/practice/affine-cipher/.meta/test_template.tera index bcb4aa73606..1ce9a9ab7ad 100644 --- a/exercises/practice/affine-cipher/.meta/test_template.tera +++ b/exercises/practice/affine-cipher/.meta/test_template.tera @@ -10,7 +10,7 @@ fn {{ test.description | make_ident }}() { let phrase = {{ test.input.phrase | json_encode() }}; let (a, b) = ({{ test.input.key.a }}, {{ test.input.key.b }}); let output = {{ test.property }}(phrase, a, b); - let expected = {% if test.expected is object -%} + let expected = {% if test.expected is map -%} Err(NotCoprime({{ test.input.key.a }})) {%- else -%} Ok({{ test.expected | json_encode() }}.into()) diff --git a/exercises/practice/all-your-base/.meta/test_template.tera b/exercises/practice/all-your-base/.meta/test_template.tera index 1e8fe4c1061..b2d0f3547bf 100644 --- a/exercises/practice/all-your-base/.meta/test_template.tera +++ b/exercises/practice/all-your-base/.meta/test_template.tera @@ -7,12 +7,12 @@ fn {{ test.description | make_ident }}() { let input_base = {{ test.input.inputBase }}; let input_digits = &{{ test.input.digits | json_encode() }}; let output_base = {{ test.input.outputBase }}; - {%- if not test.expected is object %} + {%- if not test.expected is map %} let output_digits = vec!{{ test.expected | json_encode() }}; {%- endif %} assert_eq!( ayb::convert(input_digits, input_base, output_base), - {%- if not test.expected is object %} + {%- if not test.expected is map %} Ok(output_digits) {%- elif test.expected.error == "input base must be >= 2" %} Err(ayb::Error::InvalidInputBase) diff --git a/exercises/practice/alphametics/.meta/test_template.tera b/exercises/practice/alphametics/.meta/test_template.tera index c71e14f238d..c89c94e22fc 100644 --- a/exercises/practice/alphametics/.meta/test_template.tera +++ b/exercises/practice/alphametics/.meta/test_template.tera @@ -5,7 +5,7 @@ use alphametics::*; #[ignore] fn {{ test.description | make_ident }}() { let answer = solve({{ test.input.puzzle | json_encode() }}); - {%- if test.expected is object %} + {%- if test.expected is map %} let expected = [ {%- for key, val in test.expected %} ('{{ key }}', {{val}}), diff --git a/exercises/practice/binary-search/.meta/test_template.tera b/exercises/practice/binary-search/.meta/test_template.tera index 34fa5f46e3c..77bb386a532 100644 --- a/exercises/practice/binary-search/.meta/test_template.tera +++ b/exercises/practice/binary-search/.meta/test_template.tera @@ -4,7 +4,7 @@ use binary_search::*; #[test] #[ignore] fn {{ test.description | make_ident }}() { - assert_eq!(find(&{{ test.input.array | json_encode() }}, {{ test.input.value }}), {% if test.expected is object -%} + assert_eq!(find(&{{ test.input.array | json_encode() }}, {{ test.input.value }}), {% if test.expected is map -%} None {%- else -%} Some({{ test.expected }}) diff --git a/exercises/practice/clock/.meta/test_template.tera b/exercises/practice/clock/.meta/test_template.tera index 8d7fd05212d..80467924a39 100644 --- a/exercises/practice/clock/.meta/test_template.tera +++ b/exercises/practice/clock/.meta/test_template.tera @@ -4,7 +4,7 @@ use clock::*; // Clock Creation // -{% for test in cases.0.cases %} +{% for test in cases[0].cases %} #[test] #[ignore] fn {{ test.description | make_ident }}() { @@ -16,7 +16,7 @@ fn {{ test.description | make_ident }}() { // Clock Math // -{% for test in cases.1.cases %} +{% for test in cases[1].cases %} #[test] #[ignore] fn {{ test.description | make_ident }}() { @@ -25,7 +25,7 @@ fn {{ test.description | make_ident }}() { } {% endfor %} -{% for test in cases.2.cases %} +{% for test in cases[2].cases %} #[test] #[ignore] fn {{ test.description | make_ident }}() { @@ -38,7 +38,7 @@ fn {{ test.description | make_ident }}() { // Test Equality // -{% for test in cases.3.cases %} +{% for test in cases[3].cases %} #[test] #[ignore] fn {{ test.description | make_ident }}() { diff --git a/exercises/practice/collatz-conjecture/.meta/test_template.tera b/exercises/practice/collatz-conjecture/.meta/test_template.tera index 1f2720a261f..f7cf06dc55c 100644 --- a/exercises/practice/collatz-conjecture/.meta/test_template.tera +++ b/exercises/practice/collatz-conjecture/.meta/test_template.tera @@ -5,7 +5,7 @@ use collatz_conjecture::*; #[ignore] fn {{ test.description | make_ident }}() { let output = collatz({{ test.input.number | fmt_num }}); - let expected = {% if test.expected is object %} + let expected = {% if test.expected is map %} None {% else %} Some({{ test.expected | json_encode() }}) diff --git a/exercises/practice/diamond/.meta/test_template.tera b/exercises/practice/diamond/.meta/test_template.tera index 1b2188ede91..093ef4f3923 100644 --- a/exercises/practice/diamond/.meta/test_template.tera +++ b/exercises/practice/diamond/.meta/test_template.tera @@ -9,7 +9,7 @@ fn {{ test.description | make_ident }}() { For us that means up to letter E We also exclude A to keep it inlined #} - {%- if test.input.letter is matching("[B-D]") %} + {%- if test.input.letter is matching(pat="[B-D]") %} #[rustfmt::skip] {%- endif %} assert_eq!( diff --git a/exercises/practice/dominoes/.meta/test_template.tera b/exercises/practice/dominoes/.meta/test_template.tera index d0840339742..55e2433c70c 100644 --- a/exercises/practice/dominoes/.meta/test_template.tera +++ b/exercises/practice/dominoes/.meta/test_template.tera @@ -4,7 +4,7 @@ fn {{ test.description | make_ident }}() { let input = &[ {% for domino in test.input.dominoes %} - ({{ domino.0 }}, {{domino.1 }}), + ({{ domino[0] }}, {{ domino[1] }}), {% endfor %} ]; {%- if test.expected %} diff --git a/exercises/practice/forth/.meta/test_template.tera b/exercises/practice/forth/.meta/test_template.tera index dc715226843..5fa68dc4d45 100644 --- a/exercises/practice/forth/.meta/test_template.tera +++ b/exercises/practice/forth/.meta/test_template.tera @@ -21,7 +21,7 @@ fn {{ test.description | make_ident }}() { {% continue %} {% endif -%} - {% if test.expected is object -%} + {% if test.expected is map -%} {% if test.expected.error == "empty stack" or test.expected.error == "only one value on the stack" -%} assert_eq!(f.eval("{{ test.input.instructions[0] }}"), Err(Error::StackUnderflow)); {% elif test.expected.error == "divide by zero" -%} diff --git a/exercises/practice/gigasecond/.meta/test_template.tera b/exercises/practice/gigasecond/.meta/test_template.tera index 1b61faad3bb..2e5865a6c4e 100644 --- a/exercises/practice/gigasecond/.meta/test_template.tera +++ b/exercises/practice/gigasecond/.meta/test_template.tera @@ -5,15 +5,15 @@ really makes you question your life choices. #} {% set date_and_time = test.input.moment | split(pat="T") %} -{% set date = date_and_time.0 | split(pat="-") %} -{% set year = date.0 | int %} -{% set month = date.1 | int %} -{% set day = date.2 | int %} +{% set date = date_and_time[0] | split(pat="-") %} +{% set year = date[0] | int %} +{% set month = date[1] | int %} +{% set day = date[2] | int %} {% if date_and_time | length >= 2 %} - {% set time = date_and_time.1 | split(pat=":") %} - {% set hour = time.0 | int %} - {% set minute = time.1 | int %} - {% set second = time.2 | int %} + {% set time = date_and_time[1] | split(pat=":") %} + {% set hour = time[0] | int %} + {% set minute = time[1] | int %} + {% set second = time[2] | int %} {% else %} {% set hour = 0 %} {% set minute = 0 %} @@ -24,14 +24,14 @@ again for the expected datetime #} {% set date_and_time = test.expected | split(pat="T") %} -{% set date = date_and_time.0 | split(pat="-") %} -{% set e_year = date.0 | int %} -{% set e_month = date.1 | int %} -{% set e_day = date.2 | int %} -{% set time = date_and_time.1 | split(pat=":") %} -{% set e_hour = time.0 | int %} -{% set e_minute = time.1 | int %} -{% set e_second = time.2 | int %} +{% set date = date_and_time[0] | split(pat="-") %} +{% set e_year = date[0] | int %} +{% set e_month = date[1] | int %} +{% set e_day = date[2] | int %} +{% set time = date_and_time[1] | split(pat=":") %} +{% set e_hour = time[0] | int %} +{% set e_minute = time[1] | int %} +{% set e_second = time[2] | int %} #[test] #[ignore] diff --git a/exercises/practice/grade-school/.meta/test_template.tera b/exercises/practice/grade-school/.meta/test_template.tera index 57ecc216e75..4effbd99ba1 100644 --- a/exercises/practice/grade-school/.meta/test_template.tera +++ b/exercises/practice/grade-school/.meta/test_template.tera @@ -25,7 +25,7 @@ fn {{ test.description | make_ident }}() { mut {% endif %} s = School::new(); {% for student in test.input.students -%} - s.add({{ student.1 }}, {{ student.0 | json_encode() }}); + s.add({{ student[1] }}, {{ student[0] | json_encode() }}); {% endfor -%} {% if test.property == "grade" -%} assert_eq!( diff --git a/exercises/practice/grains/.meta/test_template.tera b/exercises/practice/grains/.meta/test_template.tera index 23590743b2f..60d88c80bc3 100644 --- a/exercises/practice/grains/.meta/test_template.tera +++ b/exercises/practice/grains/.meta/test_template.tera @@ -1,9 +1,9 @@ use grains::*; -{% for test in cases.0.cases %} +{% for test in cases[0].cases %} #[test] #[ignore] -{% if test.expected is object -%} +{% if test.expected is map -%} #[should_panic] {% endif -%} fn {{ test.description | make_ident }}() { diff --git a/exercises/practice/grep/.meta/test_template.tera b/exercises/practice/grep/.meta/test_template.tera index 2fce36eeb27..e1e6ec05b0c 100644 --- a/exercises/practice/grep/.meta/test_template.tera +++ b/exercises/practice/grep/.meta/test_template.tera @@ -42,7 +42,7 @@ fn {{ test.description | make_ident }}() { ]); let actual = grep(pattern, &flags, files.as_ref()).unwrap(); let expected: &[&str] = &[ - {% if test.input.files | length > 1 or test.input.flags is containing("-l") %} + {% if test.input.files | length > 1 or test.input.flags is containing(pat="-l") %} {% for line in test.expected %} "{{ prefix }}-{{ line }}", {% endfor %} diff --git a/exercises/practice/hamming/.meta/test_template.tera b/exercises/practice/hamming/.meta/test_template.tera index 3bb6cc25241..10aec3bc672 100644 --- a/exercises/practice/hamming/.meta/test_template.tera +++ b/exercises/practice/hamming/.meta/test_template.tera @@ -6,7 +6,7 @@ use hamming::*; fn {{ test.description | make_ident }}() { assert_eq!( hamming_distance({{ test.input.strand1 | json_encode() }}, {{ test.input.strand2 | json_encode() }}), - {% if test.expected is object -%} + {% if test.expected is map -%} None {% else -%} Some({{ test.expected }}) diff --git a/exercises/practice/high-scores/.meta/test_template.tera b/exercises/practice/high-scores/.meta/test_template.tera index 3d93408a6e6..f0f68ee28b7 100644 --- a/exercises/practice/high-scores/.meta/test_template.tera +++ b/exercises/practice/high-scores/.meta/test_template.tera @@ -21,23 +21,23 @@ use high_scores::HighScores; #[test] #[ignore] fn {{ test_name }}() { - {% if test.property is starting_with("score") %} + {% if test.property is starting_with(pat="score") %} let expected = {{ test.input.scores }}; let high_scores = HighScores::new(&expected); {% else %} let high_scores = HighScores::new(&{{ test.input.scores }}); {% endif %} - {% if test.property is ending_with("AfterTopThree") %} + {% if test.property is ending_with(pat="AfterTopThree") %} let _ = high_scores.personal_top_three(); - {% elif test.property is ending_with("AfterBest") %} + {% elif test.property is ending_with(pat="AfterBest") %} let _ = high_scores.personal_best(); {% endif %} - {% if test.property is starting_with("score") %} + {% if test.property is starting_with(pat="score") %} assert_eq!(high_scores.scores(), &expected); - {% elif test.property is starting_with("latest") %} + {% elif test.property is starting_with(pat="latest") %} assert_eq!(high_scores.latest(), Some({{ test.expected }})); {% elif test.property == "personalBest" %} assert_eq!(high_scores.personal_best(), Some({{ test.expected }})); diff --git a/exercises/practice/list-ops/.meta/test_template.tera b/exercises/practice/list-ops/.meta/test_template.tera index aa5890ca2b6..80252021841 100644 --- a/exercises/practice/list-ops/.meta/test_template.tera +++ b/exercises/practice/list-ops/.meta/test_template.tera @@ -22,18 +22,18 @@ fn {{ test.description | make_ident }}() { let {{arg}} = {% if is_empty %} - {% if test.property is starting_with("fold") %} + {% if test.property is starting_with(pat="fold") %} [0.0f64; 0] {% elif test.property == "concat" %} [[0i32; 0]; 0] {% else %} [0i32; 0] {% endif %} - {% elif test.property is starting_with("fold") %} + {% elif test.property is starting_with(pat="fold") %} {% if value is number %} {{ test.input[arg] }}.0 {% else %} - {{ test.input[arg] | as_str | replace(from=",", to=".0,") | replace(from="]", to=".0]") | replace(from="[.0]", to="[]") }} + {{ test.input[arg] | str | replace(from=",", to=".0,") | replace(from="]", to=".0]") | replace(from="[.0]", to="[]") }} {% endif %} {% else %} {{ test.input[arg] }} @@ -56,7 +56,7 @@ fn {{ test.description | make_ident }}() { {% endif %} {% endfor %} ); - let expected = {{ test.expected }}{% if test.property is starting_with("fold") %}.0{% endif %}; + let expected = {{ test.expected }}{% if test.property is starting_with(pat="fold") %}.0{% endif %}; assert_eq!( output {% if test.expected is iterable %} diff --git a/exercises/practice/matching-brackets/.meta/test_template.tera b/exercises/practice/matching-brackets/.meta/test_template.tera index 25bc9bb9bf5..eb9a45efd8a 100644 --- a/exercises/practice/matching-brackets/.meta/test_template.tera +++ b/exercises/practice/matching-brackets/.meta/test_template.tera @@ -6,7 +6,7 @@ use matching_brackets::brackets_are_balanced; fn {{ test.description | make_ident }}() { assert!( {% if test.expected == false %}!{% endif %} - brackets_are_balanced("{{ test.input.value | replace(from="\", to="\\") }}") + brackets_are_balanced("{{ test.input.value | replace(from="\\", to="\\\\") }}") ); } {% endfor -%} diff --git a/exercises/practice/nth-prime/.meta/test_template.tera b/exercises/practice/nth-prime/.meta/test_template.tera index a69cc5c50f3..0409907e67f 100644 --- a/exercises/practice/nth-prime/.meta/test_template.tera +++ b/exercises/practice/nth-prime/.meta/test_template.tera @@ -4,7 +4,7 @@ use nth_prime::*; #[test] #[ignore] fn {{ test.description | make_ident }}() { - let output = nth({{ test.input.number - 1 | fmt_num }}); + let output = nth({{ (test.input.number - 1) | fmt_num }}); let expected = {{ test.expected | fmt_num }}; assert_eq!(output, expected); } diff --git a/exercises/practice/perfect-numbers/.meta/test_template.tera b/exercises/practice/perfect-numbers/.meta/test_template.tera index 82be1fa7b61..8d8fe11f4d4 100644 --- a/exercises/practice/perfect-numbers/.meta/test_template.tera +++ b/exercises/practice/perfect-numbers/.meta/test_template.tera @@ -7,7 +7,7 @@ use perfect_numbers::*; fn {{ test.description | make_ident }}() { let input = {{ test.input.number | fmt_num }}; let output = classify(input); -{%- if test.expected is object %} +{%- if test.expected is map %} assert!(output.is_none()); {% else %} let expected = Some(Classification::{{ test.expected | title }}); diff --git a/exercises/practice/phone-number/.meta/test_template.tera b/exercises/practice/phone-number/.meta/test_template.tera index 3f50cc8f6cf..9468de236de 100644 --- a/exercises/practice/phone-number/.meta/test_template.tera +++ b/exercises/practice/phone-number/.meta/test_template.tera @@ -6,7 +6,7 @@ use phone_number::*; fn {{ test.description | make_ident }}() { let input = {{ test.input.phrase | json_encode() }}; let output = number(input); -{%- if test.expected is object %} +{%- if test.expected is map %} assert!(output.is_none()); {% else %} let expected = Some({{ test.expected | json_encode() }}.into()); diff --git a/exercises/practice/pov/.meta/test_template.tera b/exercises/practice/pov/.meta/test_template.tera index a7b1afca839..2c3f9a37a6a 100644 --- a/exercises/practice/pov/.meta/test_template.tera +++ b/exercises/practice/pov/.meta/test_template.tera @@ -27,20 +27,20 @@ mod equality { } } -{% macro render_tree(tree) -%} +{% component render_tree(tree) -%} Tree::new("{{ tree.label }}") {%- if tree.children -%}{%- for child in tree.children -%} - .with_child({{ self::render_tree(tree=child) }}) + .with_child({{}}) {%- endfor -%}{%- endif -%} -{%- endmacro -%} +{%- endcomponent -%} -{%- macro render_vec(values) -%} +{%- component render_vec(values) -%} vec![ {%- for value in values -%} &"{{ value }}", {%- endfor -%} ] -{%- endmacro -%} +{%- endcomponent -%} {% for test_group in cases %} /// {{ test_group.description }} @@ -52,13 +52,13 @@ mod {{ test_group.cases[0].property | make_ident }} { #[test] #[ignore] fn {{ test.description | make_ident }}() { - let mut tree = {{ self::render_tree(tree=test.input.tree) }}; + let mut tree = {{}}; {%- if test.property == "fromPov" -%} {%- if not test.expected -%} assert!(!tree.pov_from(&"{{ test.input.from }}")); {%- else -%} assert!(tree.pov_from(&"{{ test.input.from }}")); - let expected = {{ self::render_tree(tree=test.expected) }}; + let expected = {{}}; assert_eq!(tree, expected); {%- endif -%} {%- elif test.property == "pathTo" -%} @@ -66,7 +66,7 @@ fn {{ test.description | make_ident }}() { {%- if not test.expected -%} let expected: Option> = None; {%- else -%} - let expected = Some({{ self::render_vec(values=test.expected) }}); + let expected = Some({{}}); {%- endif -%} assert_eq!(result, expected); {%- else -%} diff --git a/exercises/practice/protein-translation/.meta/test_template.tera b/exercises/practice/protein-translation/.meta/test_template.tera index 5b10a37066c..208a3b0c43d 100644 --- a/exercises/practice/protein-translation/.meta/test_template.tera +++ b/exercises/practice/protein-translation/.meta/test_template.tera @@ -6,7 +6,7 @@ use protein_translation::*; fn {{ test.description | make_ident }}() { assert_eq!( translate({{ test.input.strand | json_encode() }}), - {% if test.expected is object %} + {% if test.expected is map %} None {% else %} Some(vec![ diff --git a/exercises/practice/queen-attack/.meta/test_template.tera b/exercises/practice/queen-attack/.meta/test_template.tera index 941f42d3361..8444dcd275c 100644 --- a/exercises/practice/queen-attack/.meta/test_template.tera +++ b/exercises/practice/queen-attack/.meta/test_template.tera @@ -7,7 +7,7 @@ use queen_attack::*; fn {{ test.description | make_ident }}() { {% if test.property == "create" %} let chess_position = ChessPosition::new({{ test.input.queen.position.row }}, {{ test.input.queen.position.column }}); -{%- if test.expected is object %} +{%- if test.expected is map %} assert!(chess_position.is_none()); {% else %} assert!(chess_position.is_some()); diff --git a/exercises/practice/reverse-string/.meta/test_template.tera b/exercises/practice/reverse-string/.meta/test_template.tera index 1ddf9e05066..9522cc334ab 100644 --- a/exercises/practice/reverse-string/.meta/test_template.tera +++ b/exercises/practice/reverse-string/.meta/test_template.tera @@ -3,7 +3,7 @@ use reverse_string::*; {% for test in cases %} #[test] #[ignore] -{% if test.description is starting_with("grapheme cluster") -%} +{% if test.description is starting_with(pat="grapheme cluster") -%} #[cfg(feature = "grapheme")] {% endif -%} fn {{ test.description | make_ident }}() { diff --git a/exercises/practice/series/.meta/test_template.tera b/exercises/practice/series/.meta/test_template.tera index a093d0e2f2e..66554574bde 100644 --- a/exercises/practice/series/.meta/test_template.tera +++ b/exercises/practice/series/.meta/test_template.tera @@ -7,7 +7,7 @@ fn {{ test.description | make_ident }}() { let input = {{ test.input.series | json_encode() }}; let length = {{ test.input.sliceLength | json_encode() }}; let output = series(input, length); -{%- if test.expected is object -%} +{%- if test.expected is map -%} {# The author of the exercise chose to define the semantics such that "invalid" series return empty vectors. Adding error handling to the diff --git a/exercises/practice/triangle/.meta/test_template.tera b/exercises/practice/triangle/.meta/test_template.tera index cd13aa6c05e..06782599a59 100644 --- a/exercises/practice/triangle/.meta/test_template.tera +++ b/exercises/practice/triangle/.meta/test_template.tera @@ -7,7 +7,7 @@ mod {{ test_group.description | split(pat=" ") | first }} { {% if test.property == "equilateral" %} #[test] #[ignore] -{% if test.description is containing("float") %} +{% if test.description is containing(pat="float") %} #[cfg(feature = "generic")] {% endif -%} fn {{ test.description | make_ident }}() { @@ -23,7 +23,7 @@ fn {{ test.description | make_ident }}() { {% elif test.property == "isosceles" %} #[test] #[ignore] -{% if test.scenarios and test.scenarios is containing("floating-point") %} +{% if test.scenarios and test.scenarios is containing(pat="floating-point") %} #[cfg(feature = "generic")] {% endif -%} fn {{ test.description | make_ident }}() { @@ -39,7 +39,7 @@ fn {{ test.description | make_ident }}() { {% elif test.property == "scalene" %} #[test] #[ignore] -{% if test.scenarios and test.scenarios is containing("floating-point") %} +{% if test.scenarios and test.scenarios is containing(pat="floating-point") %} #[cfg(feature = "generic")] {% endif -%} fn {{ test.description | make_ident }}() { @@ -55,7 +55,7 @@ fn {{ test.description | make_ident }}() { {% elif test.property == "invalid" %} #[test] #[ignore] -{% if test.scenarios and test.scenarios is containing("floating-point") %} +{% if test.scenarios and test.scenarios is containing(pat="floating-point") %} #[cfg(feature = "generic")] {% endif -%} fn {{ test.description | make_ident }}() { diff --git a/exercises/practice/two-bucket/.meta/test_template.tera b/exercises/practice/two-bucket/.meta/test_template.tera index 959791f8b66..a728fa63f04 100644 --- a/exercises/practice/two-bucket/.meta/test_template.tera +++ b/exercises/practice/two-bucket/.meta/test_template.tera @@ -1,12 +1,12 @@ use two_bucket::*; -{% macro bucket(label) -%} +{% component bucket(label) -%} {% if label == 'one' -%} Bucket::One {%- else -%} Bucket::Two {%- endif %} -{%- endmacro bucket -%} +{%- endcomponent bucket -%} {% for test in cases %} #[test] @@ -14,14 +14,14 @@ use two_bucket::*; fn {{ test.description | make_ident }}() { let output = solve( {{ test.input.bucketOne }}, {{ test.input.bucketTwo }}, {{ test.input.goal }}, - &{{ self::bucket(label=test.input.startBucket) }}, + &{{}}, ); let expected = {% if 'error' in test.expected -%} None {%- else -%} Some(BucketStats { moves: {{ test.expected.moves }}, - goal_bucket: {{ self::bucket(label=test.expected.goalBucket) }}, + goal_bucket: {{}}, other_bucket: {{ test.expected.otherBucket }}, }) {%- endif %}; diff --git a/exercises/practice/variable-length-quantity/.meta/test_template.tera b/exercises/practice/variable-length-quantity/.meta/test_template.tera index 03131daca92..2318d0805b1 100644 --- a/exercises/practice/variable-length-quantity/.meta/test_template.tera +++ b/exercises/practice/variable-length-quantity/.meta/test_template.tera @@ -22,7 +22,7 @@ fn {{ test.description | make_ident }}() { {%- endfor -%} ]; let output = vlq::from_bytes(input); - let expected = {% if test.expected is object -%} + let expected = {% if test.expected is map -%} Err(vlq::Error::IncompleteNumber) {%- else -%} Ok(vec![{% for integer in test.expected -%} diff --git a/exercises/practice/wordy/.meta/test_template.tera b/exercises/practice/wordy/.meta/test_template.tera index 33cebd2ae3f..1b0bb9644eb 100644 --- a/exercises/practice/wordy/.meta/test_template.tera +++ b/exercises/practice/wordy/.meta/test_template.tera @@ -9,7 +9,7 @@ use wordy::*; fn {{ test.description | make_ident }}() { let input = {{ test.input.question | json_encode() }}; let output = answer(input); - let expected = {% if test.expected is object -%} + let expected = {% if test.expected is map -%} None {%- else -%} Some({{ test.expected }}) diff --git a/rust-tooling/Cargo.lock b/rust-tooling/Cargo.lock index 622251647ff..36228b49d9e 100644 --- a/rust-tooling/Cargo.lock +++ b/rust-tooling/Cargo.lock @@ -3,21 +3,26 @@ version = 4 [[package]] -name = "aho-corasick" -version = "1.1.4" +name = "ahash" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ - "memchr", + "cfg-if", + "getrandom 0.3.4", + "once_cell", + "serde", + "version_check", + "zerocopy", ] [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "aho-corasick" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" dependencies = [ - "libc", + "memchr", ] [[package]] @@ -76,23 +81,17 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" -[[package]] -name = "autocfg" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" - [[package]] name = "bitflags" -version = "2.13.1" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" [[package]] name = "bstr" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530" +checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" dependencies = [ "memchr", "serde_core", @@ -104,54 +103,11 @@ version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" -[[package]] -name = "cc" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5add81bb678e6cb321aff7fa0dc7689ad82b112dbc032cea19f91d6b8e3582b9" -dependencies = [ - "find-msvc-tools", - "shlex", -] - [[package]] name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "chrono" -version = "0.4.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" -dependencies = [ - "iana-time-zone", - "num-traits", - "windows-link", -] - -[[package]] -name = "chrono-tz" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf", -] - -[[package]] -name = "chrono-tz-build" -version = "0.3.0" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] +checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "ci-tests" @@ -168,9 +124,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.4" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7" +checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" dependencies = [ "clap_builder", "clap_derive", @@ -178,9 +134,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.2" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" +checksum = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d" dependencies = [ "anstream", "anstyle", @@ -190,21 +146,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.4" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d012d2b9d65aca7f18f4d9878a045bc17899bba951561ba5ec3c2ba1eed9a061" +checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" dependencies = [ "heck", "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.10", ] [[package]] name = "clap_lex" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" +checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" [[package]] name = "colorchoice" @@ -230,17 +186,11 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - [[package]] name = "crossbeam-deque" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" +checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -248,18 +198,18 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.20" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" +checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" +checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crossterm" @@ -333,9 +283,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "equivalent" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" [[package]] name = "errno" @@ -354,28 +304,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] -name = "find-msvc-tools" -version = "0.1.9" +name = "foldhash" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-core", "futures-task", @@ -405,19 +355,21 @@ dependencies = [ "serde_json", "slug", "tera", + "tera-contrib", "utils", "uuid", ] [[package]] name = "getrandom" -version = "0.2.17" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "wasi", + "r-efi 5.3.0", + "wasip2", ] [[package]] @@ -428,7 +380,7 @@ checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 6.0.0", ] [[package]] @@ -439,9 +391,9 @@ checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b" [[package]] name = "globset" -version = "0.4.19" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d37d2ae4464254884b60ab7071be2b876a9c35b696bd018ddcc76847309cd" +checksum = "f98b0d85522dc0a824cfebbc9594ff4a9b289c568bea0370319dfbdf20ccdd2d" dependencies = [ "aho-corasick", "bstr", @@ -450,17 +402,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "globwalk" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" -dependencies = [ - "bitflags", - "ignore", - "walkdir", -] - [[package]] name = "hashbrown" version = "0.17.1" @@ -473,44 +414,11 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "log", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "ignore" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a7b8211e695a1d0cd91cace480d4d0bd57667ab10277cc412c5f7f4884f83" +checksum = "484be5657551d7868d67587df967fb4fcbe9d266a761cc855aaa148fda0b3cc7" dependencies = [ "crossbeam-deque", "globset", @@ -524,9 +432,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", "hashbrown", @@ -554,38 +462,26 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itoa" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "js-sys" -version = "0.3.103" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" +checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" dependencies = [ "cfg-if", "futures-util", "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "libc" -version = "0.2.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" - -[[package]] -name = "libm" -version = "0.2.16" +version = "0.2.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a" [[package]] name = "linux-raw-sys" @@ -595,9 +491,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litrs" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" +checksum = "4744e383959f0db86ede514b809b1c53251889093803c05267acc7d4e7030d70" [[package]] name = "lock_api" @@ -610,9 +506,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.33" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "memchr" @@ -622,9 +518,9 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "mio" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" dependencies = [ "libc", "log", @@ -644,15 +540,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - [[package]] name = "once_cell" version = "1.21.4" @@ -688,116 +575,12 @@ dependencies = [ "windows-link", ] -[[package]] -name = "parse-zoneinfo" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" -dependencies = [ - "regex", -] - -[[package]] -name = "percent-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" - -[[package]] -name = "pest" -version = "2.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df728be843c7070fab6ab7c328c4e9e9d78e23bf749c0669c86ee7ebfa050a2" -dependencies = [ - "memchr", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2dd6fc3b26b3462ee188aac870f5a41d398f1cd5e2408d16531bd71c9591fd" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7a9205cfb6f596a9e8b689c0a15f9ceb7a1aafae7aaf788150ac65b29975b6" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "pest_meta" -version = "2.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85abd351c0de1e8384fc791a0737111a350394937e92b956b743dac12429f57c" -dependencies = [ - "pest", -] - -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher", -] - [[package]] name = "pin-project-lite" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "proc-macro2" version = "1.0.107" @@ -807,6 +590,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + [[package]] name = "quote" version = "1.0.47" @@ -818,39 +607,15 @@ dependencies = [ [[package]] name = "r-efi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" - -[[package]] -name = "rand" -version = "0.8.7" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" +name = "r-efi" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "redox_syscall" @@ -875,9 +640,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -901,9 +666,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags", "errno", @@ -966,15 +731,16 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.10", ] [[package]] name = "serde_json" -version = "1.0.151" +version = "1.0.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14" +checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" dependencies = [ + "foldhash", "indexmap", "itoa", "memchr", @@ -991,15 +757,9 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.10", ] -[[package]] -name = "shlex" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" - [[package]] name = "signal-hook" version = "0.3.18" @@ -1031,12 +791,6 @@ dependencies = [ "libc", ] -[[package]] -name = "siphasher" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" - [[package]] name = "slab" version = "0.4.12" @@ -1055,9 +809,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.2" +version = "1.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" +checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46" [[package]] name = "strsim" @@ -1078,9 +832,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.3" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79" dependencies = [ "proc-macro2", "quote", @@ -1102,24 +856,26 @@ dependencies = [ [[package]] name = "tera" -version = "1.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8004bca281f2d32df3bacd59bc67b312cb4c70cea46cbd79dbe8ac5ed206722" -dependencies = [ - "chrono", - "chrono-tz", - "globwalk", - "humansize", - "lazy_static", - "percent-encoding", - "pest", - "pest_derive", - "rand", - "regex", +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e0cadeeb54426080b4c5395d59769ce8293f542cc25511c167c742b2175809" +dependencies = [ + "ahash", + "indexmap", + "itoa", + "pulldown-cmark-escape", "serde", +] + +[[package]] +name = "tera-contrib" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c07f9f25dce5c40e92d0dcaa33508c451a07395dfcdd9040320ed6bb4a52a9" +dependencies = [ + "regex", "serde_json", - "slug", - "unicode-segmentation", + "tera", ] [[package]] @@ -1131,17 +887,11 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "ucd-trie" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" - [[package]] name = "unicode-ident" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" [[package]] name = "unicode-segmentation" @@ -1151,9 +901,9 @@ checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557" [[package]] name = "utf8parse" @@ -1167,15 +917,21 @@ version = "0.1.0" [[package]] name = "uuid" -version = "1.24.0" +version = "1.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "bed99139f7dac9b5cfe5f17be4d66dc7079a34dee1d74bcc77217119240e267c" dependencies = [ "getrandom 0.4.3", "js-sys", "wasm-bindgen", ] +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "walkdir" version = "2.5.0" @@ -1192,14 +948,22 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" +[[package]] +name = "wasip2" +version = "1.0.4+wasi-0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" -version = "0.2.126" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" +checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" dependencies = [ "cfg-if", - "once_cell", "rustversion", "wasm-bindgen-macro", "wasm-bindgen-shared", @@ -1207,9 +971,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.126" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" +checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1217,22 +981,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.126" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" +checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.10", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.126" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" +checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" dependencies = [ "unicode-ident", ] @@ -1268,65 +1032,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-implement" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "windows-interface" -version = "0.59.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -1336,20 +1047,26 @@ dependencies = [ "windows-link", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "zerocopy" -version = "0.8.55" +version = "0.8.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a105cd7b140f6eeec8acff2ea38135d3cab283ada58540f629fe51e46696eb" +checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.55" +version = "0.8.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe976fb70c78cd64cccfe3a6fc142244e8a77b70959b30faf9d0ac37ee228eb" +checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f" dependencies = [ "proc-macro2", "quote", diff --git a/rust-tooling/generate/Cargo.toml b/rust-tooling/generate/Cargo.toml index aeba70d26c7..663194882df 100644 --- a/rust-tooling/generate/Cargo.toml +++ b/rust-tooling/generate/Cargo.toml @@ -20,6 +20,7 @@ inquire = "0.9.0" models = { version = "0.1.0", path = "../models" } serde_json = { version = "1.0.105", features = ["arbitrary_precision", "preserve_order"] } slug = "0.1.5" -tera = "1.19.1" +tera = { version = "2.4.0", features = ["fast", "preserve_order"] } +tera-contrib = { version = "0.3.0", features = ["json", "regex"] } utils = { version = "0.1.0", path = "../utils" } uuid = { version = "1.4.1", features = ["v4"] } diff --git a/rust-tooling/generate/src/custom_filters.rs b/rust-tooling/generate/src/custom_filters.rs index 39b65daa645..3ce8847bb8e 100644 --- a/rust-tooling/generate/src/custom_filters.rs +++ b/rust-tooling/generate/src/custom_filters.rs @@ -1,39 +1,17 @@ -use std::collections::HashMap; +use tera::{Kwargs, Number, State, TeraResult as Result, Value}; -use tera::{Result, Value}; - -type Filter = fn(&Value, &HashMap) -> Result; - -pub static CUSTOM_FILTERS: &[(&str, Filter)] = &[ - ("to_hex", to_hex), - ("make_ident", make_ident), - ("fmt_num", fmt_num), -]; - -pub fn to_hex(value: &Value, _args: &HashMap) -> Result { - let Some(value) = value.as_u64() else { - return Err(tera::Error::call_filter( - "to_hex filter expects an unsigned integer", - "serde_json::value::Value::as_u64", - )); - }; - Ok(serde_json::Value::String(format!("{:x}", value))) +pub fn to_hex(value: u64, _args: Kwargs, _state: &State) -> Result { + Ok(Value::safe_string(&format!("{:x}", value))) } -pub fn make_ident(value: &Value, _args: &HashMap) -> Result { - let Some(value) = value.as_str() else { - return Err(tera::Error::call_filter( - "make_ident filter expects a string", - "serde_json::value::Value::as_str", - )); - }; +pub fn make_ident(value: &str, _args: Kwargs, _state: &State) -> Result { let value = split_camel_case_with_underscore(value); let value = slug::slugify(value).replace('-', "_"); if !value.chars().next().unwrap_or_default().is_alphabetic() { // identifiers cannot start with digits etc. - return Ok(Value::String(format!("test_{value}"))); + return Ok(Value::safe_string(&format!("test_{value}"))); } - Ok(Value::String(value)) + Ok(Value::safe_string(&value)) } fn split_camel_case_with_underscore(input: &str) -> String { @@ -49,13 +27,7 @@ fn split_camel_case_with_underscore(input: &str) -> String { chars.into_iter().collect() } -pub fn fmt_num(value: &Value, _args: &HashMap) -> Result { - let Some(value) = value.as_number() else { - return Err(tera::Error::call_filter( - "fmt_num filter expects a number", - "serde_json::value::Value::as_number", - )); - }; +pub fn fmt_num(value: Number, _args: Kwargs, _state: &State) -> Result { let mut num: Vec<_> = value.to_string().into(); num.reverse(); @@ -68,5 +40,5 @@ pub fn fmt_num(value: &Value, _args: &HashMap) -> Result { } pretty_digits.reverse(); let pretty_num = String::from_utf8(pretty_digits).unwrap_or_default(); - Ok(Value::String(pretty_num)) + Ok(Value::safe_string(&pretty_num)) } diff --git a/rust-tooling/generate/src/lib.rs b/rust-tooling/generate/src/lib.rs index fc58df20e06..0ae8d1f358a 100644 --- a/rust-tooling/generate/src/lib.rs +++ b/rust-tooling/generate/src/lib.rs @@ -6,11 +6,13 @@ use std::{ use anyhow::{Context, Result}; use tera::Tera; -use custom_filters::CUSTOM_FILTERS; use models::{ exercise_config::get_excluded_tests, problem_spec::{TestCase, get_additional_test_cases, get_canonical_data}, }; +use tera_contrib::{json::json_encode, regex::Matching}; + +use crate::custom_filters::{fmt_num, make_ident, to_hex}; mod custom_filters; @@ -104,20 +106,30 @@ fn generate_tests(slug: &str) -> Result { cases }; let excluded_tests = get_excluded_tests(slug); - let mut template = get_test_template(slug).context("failed to get test template")?; + let mut template = Tera::new(); + + // register custom filters (before adding template file) + template.register_filter("json_encode", json_encode); + template.register_test("matching", Matching::default()); + template.register_filter("to_hex", to_hex); + template.register_filter("make_ident", make_ident); + template.register_filter("fmt_num", fmt_num); + + template.add_template_file( + format!("exercises/practice/{slug}/.meta/test_template.tera").as_str(), + Some("test_template.tera"), + )?; if template.get_template_names().next().is_none() { template .add_raw_template("test_template.tera", TEST_TEMPLATE) .context("failed to add default template")?; } - for (name, filter) in CUSTOM_FILTERS { - template.register_filter(name, filter); - } remove_excluded_tests(&mut cases, &excluded_tests); + let cases = serde_json::to_value(&cases).context("failed to convert test cases to JSON")?; let mut context = tera::Context::new(); - context.insert("cases", &cases); + context.insert_value("cases", json_to_tera(cases)?); let rendered = template .render("test_template.tera", &context) @@ -167,6 +179,47 @@ It probably generates invalid Rust code." Ok(String::from_utf8_lossy(&rustfmt_out.stdout).into_owned()) } -pub fn get_test_template(slug: &str) -> Result { - Tera::new(format!("exercises/practice/{slug}/.meta/*.tera").as_str()).map_err(Into::into) +/// Converts a `serde_json::Value` into a `tera::Value`. +/// +/// We cannot simply pass our data to `tera::Context::insert`, because +/// that goes through tera's own serde serializer. serde_json's feature +/// `arbitrary_precision` serializes numbers as a struct, which tera turns into +/// a map like `{"$serde_json::private::Number": "42"}`. +/// +/// This used to just work with tera v1, because it used `serde_json::Value` +/// internally. But upstream doesn't want to support it in v2 anymore: +/// +fn json_to_tera(value: serde_json::Value) -> Result { + use serde_json::Value as Json; + + Ok(match value { + Json::Null => tera::Value::none(), + Json::Bool(b) => b.into(), + Json::Number(n) => { + if let Some(n) = n.as_u64() { + n.into() + } else if let Some(n) = n.as_i64() { + n.into() + } else if let Some(n) = n.as_u128() { + n.into() + } else if let Some(n) = n.as_i128() { + n.into() + } else if let Some(n) = n.as_f64() { + n.into() + } else { + anyhow::bail!("number does not fit into f64: {n}"); + } + } + Json::String(s) => s.into(), + Json::Array(array) => array + .into_iter() + .map(json_to_tera) + .collect::>>()? + .into(), + Json::Object(object) => object + .into_iter() + .map(|(k, v)| Ok((tera::value::Key::from(k), json_to_tera(v)?))) + .collect::>()? + .into(), + }) }