trackler 2.2.1.61 → 2.2.1.62

data/tracks/python/exercises/strain/README.md

@@ -9,7 +9,9 @@ For example, given the collection of numbers:
 
 - 1, 2, 3, 4, 5
 
-And the predicate:
+And the predicate: 
+
+Note: _a predicate P(x) will be true or false, depending on whether x belongs to a set._ [Wikipedia - Predicate](https://en.wikipedia.org/wiki/Predicate_(mathematical_logic)))
 
 - is the number even?
 

data/tracks/python/exercises/strain/strain.py

@@ -1,6 +1,6 @@
-def keep():
+def keep(sequence, predicate):
     pass
 
 
-def discard():
+def discard(sequence, predicate):
     pass

data/tracks/rust/.travis.yml

@@ -6,6 +6,7 @@ script:
 - "sh ./_test/ensure-stubs-compile.sh"
 - "sh ./_test/count-ignores.sh"
 - "./bin/fetch-configlet"
+- "sh ./_test/ensure-readmes-are-updated.sh"
 - "./bin/configlet lint ."
 sudo: false
 rust:

data/tracks/rust/README.md

@@ -92,6 +92,8 @@ Note that:
 - An exercise may contain `.meta/hints.md`.  This is optional and will appear after the normal exercise
   instructions if present.  Rust is different in many ways from other languages.  This is a place where the differences required for Rust are explained.  If it is a large change, you may want to call this out as a comment at the top of `src/lib.rs`, so the user recognises to read this section before starting.
 
+- If the test suite is appreciably sped up by running in release mode, and there is reason to be confident that the example implementation does not contain any overflow errors, consider adding a file `.meta/test-in-release-mode`. This should contain brief comments explaining the situation.
+
 - `README.md` may be [regenerated](https://github.com/exercism/docs/blob/master/maintaining-a-track/regenerating-exercise-readmes.md) from Exercism data. The generator will use the `description.md` from the exercise directory in the [problem-specifications repository](https://github.com/exercism/problem-specifications/tree/master/exercises), then any hints in `.meta/hints.md`, then the [Rust-specific instructions](https://github.com/exercism/rust/blob/master/config/exercise-readme-insert.md). The `## Source` section comes from the `metadata.yml` in the same directory.  Convention is that the description of the source remains text and the link is both name and hyperlink of the markdown link.
 
 - Be sure to add the exercise to an appropriate place in the `config.json` file.  The position in the file determines the order exercises are sent.   Generate a unique UUID for the exercise.  Current difficuly levels in use are 1, 4, 7 and 10.

data/tracks/rust/_test/check-exercises.sh

@@ -1,73 +1,60 @@
 #!/bin/bash
 
+# test for existence and executability of the test-exercise script
+# this depends on that
+if [ ! -f "./bin/test-exercise" ]; then
+   echo "bin/test-exercise does not exist"
+   exit 1
+fi
+if [ ! -x "./bin/test-exercise" ]; then
+   echo "bin/test-exercise does not have its executable bit set"
+   exit 1
+fi
+
 # In DENYWARNINGS mode, do not set -e so that we run all tests.
 # This allows us to see all warnings.
 if [ -z "$DENYWARNINGS" ]; then
     set -e
 fi
 
+# can't benchmark with a stable compiler; to bench, use
+# $ BENCHMARK=1 rustup run nightly _test/check-exercises.sh
 if [ -n "$BENCHMARK" ]; then
     files=exercises/*/benches
 else
     files=exercises/*/tests
 fi
 
-tmp=${TMPDIR:-/tmp/}
-mkdir "${tmp}exercises"
-
-exitcode=0
-
+return_code=0
 # An exercise worth testing is defined here as any top level directory with
 # a 'tests' directory
 for exercise in $files; do
-    # This assumes that exercises are only one directory deep
-    # and that the primary module is named the same as the directory
-    directory=$(dirname "${exercise}");
-
-    workdir=$(mktemp -d "${tmp}${directory}.XXXXXXXXXX")
-
-    cp -R -T $directory $workdir
-
-    # Run in subshell to change workdir without affecting current workdir.
-    (
-        cd $workdir
-
-        cp example.rs src/lib.rs
-
-        # Overwrite empty Cargo.toml if an example specific file exists
-        if [ -f Cargo-example.toml ]; then
-            cp Cargo-example.toml Cargo.toml
-        fi
-
-        # Forcibly strip all "ignore" statements from the testing files
-        for test in tests/*.rs; do
-            sed -i '/\[ignore\]/d' $test
-        done
-
-        # Run benchmarks instead of tests when enabled.
-        if [ -n "$BENCHMARK" ]; then
-            cargo bench
-        elif [ -n "$DENYWARNINGS" ]; then
-            sed -i -e '1i #![deny(warnings)]' src/lib.rs
-
-            # No-run mode so we see no test output.
-            # Quiet mode so we see no compile output
-            # (such as "Compiling"/"Downloading").
-            # Compiler errors will still be shown though.
-            # Both flags are necessary to keep things quiet.
-            cargo test --quiet --no-run
-        else
-            # Run the test and get the status
-            cargo test
-        fi
-    )
-
-    status=$?
-
-    if [ $status -ne 0 ]
-    then
-        exitcode=1
-    fi
+   # This assumes that exercises are only one directory deep
+   # and that the primary module is named the same as the directory
+   directory=$(dirname "${exercise}")
+
+   release=""
+   if [ -z "$BENCHMARK" -a -f "$directory/.meta/test-in-release-mode" ]; then
+      release="--release"
+   fi
+
+   if [ -n "$DENYWARNINGS" ]; then
+      # No-run mode so we see no test output.
+      # Quiet mode so we see no compile output
+      # (such as "Compiling"/"Downloading").
+      # Compiler errors will still be shown though.
+      # Both flags are necessary to keep things quiet.
+      ./bin/test-exercise $directory --quiet --no-run
+      return_code=$(($return_code | $?))
+   else
+      # Run the test and get the status
+      # We use release mode here because, while it somewhat increases
+      # the compile time for all exercises, it substantially improves
+      # the runtime for certain exercises such as alphametics.
+      # Overall this should be an improvement.
+      ./bin/test-exercise $directory $release
+      return_code=$(($return_code | $?))
+   fi
 done
 
-exit $exitcode
+exit $return_code

data/tracks/rust/_test/ensure-readmes-are-updated.sh

@@ -0,0 +1,40 @@
+if [ ! -x bin/configlet ]; then
+   echo "Improper configuration; configlet should exist in bin/ when this script is run"
+   echo "Ping a Rust track maintainer to fix this"
+   exit 1
+fi
+
+if [ ! -d "problem-specifications" ]; then
+   git clone https://github.com/exercism/problem-specifications.git problem-specifications
+fi
+
+newline=$'\n  '
+
+missing_readmes=""
+wrong_readmes=""
+for exercise in $(git diff --name-only master..$(git rev-parse --abbrev-ref HEAD) | grep exercises/ | cut -d'/' -f2 -s | sort -fu); do
+   echo "Checking readme for $exercise"
+   readme_path="exercises/${exercise}/README.md"
+   if [ ! -f $readme_path ]; then
+      missing_readmes="$missing_readmes$newline$exercise"
+   else
+      existing_readme_checksum=$(md5sum $readme_path | cut -d' ' -f1)
+      # generate the new README
+      bin/configlet generate . --only "$exercise" --spec-path "problem-specifications"
+      generated_readme_checksum=$(md5sum $readme_path | cut -d' ' -f1)
+
+      if [ $existing_readme_checksum != $generated_readme_checksum ]; then
+         wrong_readmes="$wrong_readmes$newline$exercise"
+      fi
+   fi
+done
+
+if [ -n "$missing_readmes" ]; then
+  echo "Exercises missing README.md:$missing_readmes"
+fi
+if [ -n "$wrong_readmes" ]; then
+  echo "Exercises with out-of-date README.md:$wrong_readmes"
+fi
+if [ -n "$missing_readmes" -o -n "$wrong_readmes" ]; then
+   exit 1
+fi

data/tracks/rust/bin/test-exercise

@@ -0,0 +1,84 @@
+#!/bin/bash
+# Test an exercise
+
+# which exercise are we testing right now?
+# if we were passed an argument, that should be the
+# exercise directory. Otherwise, assume we're in
+# it currently.
+if [ $# -ge 1 ]; then
+   exercise=$1
+   # if this script is called with arguments, it will pass through
+   # any beyond the first to cargo. Note that we can only get a
+   # free default argument if no arguments at all were passed,
+   # so if you are in the exercise directory and want to pass any
+   # arguments to cargo, you need to include the local path first.
+   # I.e. to test in release mode:
+   # $ test-exercise . --release
+   shift 1
+else
+   exercise='.'
+fi
+
+# what cargo command will we use?
+if [ -n "$BENCHMARK" ]; then
+   command="bench"
+else
+   command="test"
+fi
+
+declare -a preserve_files=("src/lib.rs" "Cargo.toml" "Cargo.lock")
+declare -a preserve_dirs=("tests")
+
+# reset instructions
+reset () {
+   for file in ${preserve_files[@]}; do
+      if [ -f "$exercise/$file.orig" ]; then
+         mv -f "$exercise/$file.orig" "$exercise/$file"
+      fi
+   done
+   for dir in ${preserve_dirs[@]}; do
+      if [ -d "$exercise/$dir.orig" ]; then
+         rm -rf "$exercise/$dir"
+         mv "$exercise/$dir.orig" "$exercise/$dir"
+      fi
+   done
+}
+
+# cause the reset to execute when the script exits normally or is killed
+trap reset EXIT INT TERM
+
+# preserve the files and directories we care about
+for file in ${preserve_files[@]}; do
+   if [ -f "$exercise/$file" ]; then
+      cp "$exercise/$file" "$exercise/$file.orig"
+   fi
+done
+for dir in ${preserve_dirs[@]}; do
+   if [ -d "$exercise/$dir" ]; then
+      cp -r "$exercise/$dir" "$exercise/$dir.orig"
+   fi
+done
+
+# Move example files to where Cargo expects them
+cp -f "$exercise/example.rs" "$exercise/src/lib.rs"
+if [ -f "$exercise/Cargo-example.toml" ]; then
+   cp -f "$exercise/Cargo-example.toml" "$exercise/Cargo.toml"
+fi
+
+# If deny warnings, insert a deny warnings compiler directive in the header
+if [ -n "$DENYWARNINGS" ]; then
+   sed -i -e '1i #![deny(warnings)]' "$exercise/src/lib.rs"
+fi
+
+# eliminate #[ignore] lines from tests
+for test in "$exercise/tests/*.rs"; do
+    sed -i '/\[ignore\]/d' $test
+done
+
+# run tests from within exercise directory
+# (use subshell so we auto-reset to current pwd after)
+(
+   cd $exercise
+   # this is the last command; its exit code is what's passed on
+   cargo $command "$@"
+)

data/tracks/rust/exercises/alphametics/.meta/test-in-release-mode

@@ -0,0 +1,2 @@
+Takes a very long time to test in debug mode.
+Example implementation not known to encounter overflow errors.

data/tracks/rust/exercises/alphametics/src/lib.rs

@@ -1,5 +1,5 @@
 use std::collections::HashMap;
 
-pub fn solve(puzzle: &str) -> Option<HashMap<char, u8>> {
+pub fn solve(_: &str) -> Option<HashMap<char, u8>> {
     unimplemented!()
 }

data/tracks/rust/exercises/dominoes/README.md

@@ -7,10 +7,10 @@ correct domino chain (the dots on one half of a stone match the dots on the
 neighbouring half of an adjacent stone) and that dots on the halfs of the stones
 which don't have a neighbour (the first and last stone) match each other.
 
-For example given the stones `21`, `23` and `13` you should compute something
-like `12 23 31` or `32 21 13` or `13 32 21` etc, where the first and last numbers are the same.
+For example given the stones `[2|1]`, `[2|3]` and `[1|3]` you should compute something
+like `[1|2] [2|3] [3|1]` or `[3|2] [2|1] [1|3]` or `[1|3] [3|2] [2|1]` etc, where the first and last numbers are the same.
 
-For stones 12, 41 and 23 the resulting chain is not valid: 41 12 23's first and last numbers are not the same. 4 != 3
+For stones `[1|2]`, `[4|1]` and `[2|3]` the resulting chain is not valid: `[4|1] [1|2] [2|3]`'s first and last numbers are not the same. 4 != 3
 
 Some test cases may use duplicate stones in a chain solution, assume that multiple Domino sets are being used.
 

data/tracks/rust/exercises/isbn-verifier/README.md

@@ -54,7 +54,7 @@ to pass again.  The test file is located in the `tests` directory.   You can
 also remove the ignore flag from all the tests to get them to run all at once
 if you wish.
 
-Make sure to read the [Crates and Modules](https://doc.rust-lang.org/stable/book/crates-and-modules.html) chapter if you
+Make sure to read the [Modules](https://doc.rust-lang.org/book/second-edition/ch07-00-modules.html) chapter if you
 haven't already, it will help you with organizing your files.
 
 ## Feedback, Issues, Pull Requests
@@ -64,7 +64,8 @@ The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is th
 If you want to know more about Exercism, take a look at the [contribution guide](https://github.com/exercism/docs/blob/master/contributing-to-language-tracks/README.md).
 
 [help-page]: http://exercism.io/languages/rust
-[crates-and-modules]: http://doc.rust-lang.org/stable/book/crates-and-modules.html
+[modules]: https://doc.rust-lang.org/book/second-edition/ch07-00-modules.html
+[cargo]: https://doc.rust-lang.org/book/second-edition/ch14-00-more-about-cargo.html
 
 ## Source
 

data/tracks/rust/exercises/nucleotide-count/README.md

@@ -2,8 +2,8 @@
 
 Given a single stranded DNA string, compute how many times each nucleotide occurs in the string.
 
-The genetic language of every living thing on the planet is DNA. 
-DNA is a large molecule that is built from an extremely long sequence of individual elements called nucleotides. 
+The genetic language of every living thing on the planet is DNA.
+DNA is a large molecule that is built from an extremely long sequence of individual elements called nucleotides.
 4 types exist in DNA and these differ only slightly and can be represented as the following symbols: 'A' for adenine, 'C' for cytosine, 'G' for guanine, and 'T' thymine.
 
 Here is an analogy:

data/tracks/rust/exercises/perfect-numbers/src/lib.rs

@@ -0,0 +1,10 @@
+#[derive(Debug, PartialEq, Eq)]
+pub enum Classification {
+    Abundant,
+    Perfect,
+    Deficient
+}
+
+pub fn classify(num: u64) -> Result<Classification, & 'static str> {
+    unimplemented!();
+}

data/tracks/rust/exercises/phone-number/README.md

@@ -14,7 +14,7 @@ The format is usually represented as
 
 where `N` is any digit from 2 through 9 and `X` is any digit from 0 through 9.
 
-Your task is to clean up differently formated telephone numbers by removing punctuation and the country code (1) if present.
+Your task is to clean up differently formatted telephone numbers by removing punctuation and the country code (1) if present.
 
 For example, the inputs
 - `+1 (613)-995-0253`

data/tracks/rust/exercises/pythagorean-triplet/src/lib.rs

@@ -0,0 +1,3 @@
+pub fn find() -> Option<u32> {
+    unimplemented!();
+}

data/tracks/rust/exercises/rectangles/README.md

@@ -37,27 +37,27 @@ The above diagram contains 6 rectangles:
 ```
 
 ```text
-       
-       
+
+
    +--+
    |  |
    +--+
 ```
 
 ```text
-       
-       
+
+
 +--+
 |  |
 +--+
 ```
 
 ```text
-       
-  ++   
-  ++   
-       
-       
+
+  ++
+  ++
+
+
 ```
 
 You may assume that the input is always a proper rectangle (i.e. the length of

data/tracks/rust/exercises/two-bucket/README.md

@@ -7,15 +7,15 @@ Since this mathematical problem is fairly subject to interpretation / individual
 To help, the tests provide you with which bucket to fill first. That means, when starting with the larger bucket full, you are NOT allowed at any point to have the smaller bucket full and the larger bucket empty (aka, the opposite starting point); that would defeat the purpose of comparing both approaches!
 
 Your program will take as input:
-- the size of bucket one, passed as a numeric value
-- the size of bucket two, passed as a numeric value
-- the desired number of liters to reach, passed as a numeric value
-- which bucket to fill first, passed as a Bucket (either Bucket::One or Bucket::Two)
+- the size of bucket one
+- the size of bucket two
+- the desired number of liters to reach
+- which bucket to fill first, either bucket one or bucket two
 
 Your program should determine:
-- the total number of "moves" it should take to reach the desired number of liters, including the first fill - expects a numeric value
-- which bucket should end up with the desired number of liters (let's say this is bucket A) - expects a Bucket (either Bucket::One or Bucket::Two)
-- how many liters are left in the other bucket (bucket B) - expects a numeric value
+- the total number of "moves" it should take to reach the desired number of liters, including the first fill
+- which bucket should end up with the desired number of liters (let's say this is bucket A) - either bucket one or bucket two
+- how many liters are left in the other bucket (bucket B)
 
 Note: any time a change is made to either or both buckets counts as one (1) move.
 

data/tracks/typescript/config.json

@@ -509,6 +509,22 @@
       ],
       "unlocked_by": "matrix",
       "uuid": "61f0964f-0779-446d-bd6b-6bb988414302"
+    },
+    {
+      "uuid": "2331a447-054d-4a80-52d7-fe2d667baaafcd3fc58",
+      "slug": "diamond",
+      "core": false,
+      "unlocked_by": "pascals-triangle",
+      "difficulty": 5,
+      "topics": [
+        "Control-flow (conditionals)",
+        "Control-flow (loops)",
+        "Arrays",
+        "Parsing",
+        "Games",
+        "Exception handling",
+        "Text formatting"
+      ]
     }
   ],
   "foregone": [],