trackler 2.2.1.128 → 2.2.1.129

data/tracks/rust/exercises/bowling/tests/bowling.rs

@@ -13,12 +13,12 @@ fn roll_returns_a_result() {
 fn you_can_not_roll_more_than_ten_pins_in_a_single_roll() {
     let mut game = BowlingGame::new();
 
-    assert!(game.roll(11).is_err());
+    assert_eq!(game.roll(11), Err(Error::NotEnoughPinsLeft));;
 }
 
 #[test]
 #[ignore]
-fn a_game_score_is_ok_if_ten_frames_have_been_rolled() {
+fn a_game_score_is_some_if_ten_frames_have_been_rolled() {
     let mut game = BowlingGame::new();
 
     for _ in 0..10 {
@@ -26,7 +26,7 @@ fn a_game_score_is_ok_if_ten_frames_have_been_rolled() {
         let _ = game.roll(0);
     }
 
-    assert!(game.score().is_ok());
+    assert!(game.score().is_some());
 }
 
 #[test]
@@ -34,12 +34,12 @@ fn a_game_score_is_ok_if_ten_frames_have_been_rolled() {
 fn you_can_not_score_a_game_with_no_rolls() {
     let game = BowlingGame::new();
 
-    assert!(game.score().is_err());
+    assert_eq!(game.score(), None);
 }
 
 #[test]
 #[ignore]
-fn a_game_score_is_err_if_fewer_than_ten_frames_have_been_rolled() {
+fn a_game_score_is_none_if_fewer_than_ten_frames_have_been_rolled() {
     let mut game = BowlingGame::new();
 
     for _ in 0..9 {
@@ -47,7 +47,7 @@ fn a_game_score_is_err_if_fewer_than_ten_frames_have_been_rolled() {
         let _ = game.roll(0);
     }
 
-    assert!(game.score().is_err());
+    assert_eq!(game.score(), None);
 }
 
 #[test]
@@ -60,7 +60,7 @@ fn a_roll_is_err_if_the_game_is_done() {
         let _ = game.roll(0);
     }
 
-    assert!(game.roll(0).is_err());
+    assert_eq!(game.roll(0), Err(Error::GameComplete));;
 }
 
 #[test]
@@ -72,7 +72,7 @@ fn twenty_zero_pin_rolls_scores_zero() {
         let _ = game.roll(0);
     }
 
-    assert_eq!(game.score(), Ok(0));
+    assert_eq!(game.score(), Some(0));
 }
 
 #[test]
@@ -85,7 +85,7 @@ fn ten_frames_without_a_strike_or_spare() {
         let _ = game.roll(6);
     }
 
-    assert_eq!(game.score(), Ok(90));
+    assert_eq!(game.score(), Some(90));
 }
 
 #[test]
@@ -100,7 +100,7 @@ fn spare_in_the_first_frame_followed_by_zeros() {
         let _ = game.roll(0);
     }
 
-    assert_eq!(game.score(), Ok(10));
+    assert_eq!(game.score(), Some(10));
 }
 
 #[test]
@@ -116,7 +116,7 @@ fn points_scored_in_the_roll_after_a_spare_are_counted_twice_as_a_bonus() {
         let _ = game.roll(0);
     }
 
-    assert_eq!(game.score(), Ok(16));
+    assert_eq!(game.score(), Some(16));
 }
 
 #[test]
@@ -134,7 +134,7 @@ fn consecutive_spares_each_get_a_one_roll_bonus() {
         let _ = game.roll(0);
     }
 
-    assert_eq!(game.score(), Ok(31));
+    assert_eq!(game.score(), Some(31));
 }
 
 #[test]
@@ -150,7 +150,7 @@ fn if_the_last_frame_is_a_spare_you_get_one_extra_roll_that_is_scored_once() {
     let _ = game.roll(5);
     let _ = game.roll(7);
 
-    assert_eq!(game.score(), Ok(17));
+    assert_eq!(game.score(), Some(17));
 }
 
 #[test]
@@ -164,7 +164,7 @@ fn a_strike_earns_ten_points_in_a_frame_with_a_single_roll() {
         let _ = game.roll(0);
     }
 
-    assert_eq!(game.score(), Ok(10));
+    assert_eq!(game.score(), Some(10));
 }
 
 #[test]
@@ -180,7 +180,7 @@ fn points_scored_in_the_two_rolls_after_a_strike_are_counted_twice_as_a_bonus()
         let _ = game.roll(0);
     }
 
-    assert_eq!(game.score(), Ok(26));
+    assert_eq!(game.score(), Some(26));
 }
 
 #[test]
@@ -198,7 +198,7 @@ fn consecutive_strikes_each_get_the_two_roll_bonus() {
         let _ = game.roll(0);
     }
 
-    assert_eq!(game.score(), Ok(81));
+    assert_eq!(game.score(), Some(81));
 }
 
 #[test]
@@ -214,7 +214,7 @@ fn a_strike_in_the_last_frame_earns_a_two_roll_bonus_that_is_counted_once() {
     let _ = game.roll(7);
     let _ = game.roll(1);
 
-    assert_eq!(game.score(), Ok(18));
+    assert_eq!(game.score(), Some(18));
 }
 
 #[test]
@@ -230,7 +230,7 @@ fn a_spare_with_the_two_roll_bonus_does_not_get_a_bonus_roll() {
     let _ = game.roll(7);
     let _ = game.roll(3);
 
-    assert_eq!(game.score(), Ok(20));
+    assert_eq!(game.score(), Some(20));
 }
 
 #[test]
@@ -246,7 +246,7 @@ fn strikes_with_the_two_roll_bonus_do_not_get_a_bonus_roll() {
     let _ = game.roll(10);
     let _ = game.roll(10);
 
-    assert_eq!(game.score(), Ok(30));
+    assert_eq!(game.score(), Some(30));
 }
 
 #[test]
@@ -262,7 +262,7 @@ fn a_strike_with_the_one_roll_bonus_after_a_spare_in_the_last_frame_does_not_get
     let _ = game.roll(3);
     let _ = game.roll(10);
 
-    assert_eq!(game.score(), Ok(20));
+    assert_eq!(game.score(), Some(20));
 }
 
 #[test]
@@ -274,7 +274,7 @@ fn all_strikes_is_a_perfect_score_of_300() {
         let _ = game.roll(10);
     }
 
-    assert_eq!(game.score(), Ok(300));
+    assert_eq!(game.score(), Some(300));
 }
 
 #[test]
@@ -283,7 +283,7 @@ fn you_can_not_roll_more_than_ten_pins_in_a_single_frame() {
     let mut game = BowlingGame::new();
 
     assert!(game.roll(5).is_ok());
-    assert!(game.roll(6).is_err());
+    assert_eq!(game.roll(6), Err(Error::NotEnoughPinsLeft));;
 }
 
 #[test]
@@ -297,7 +297,7 @@ fn first_bonus_ball_after_a_final_strike_can_not_score_an_invalid_number_of_pins
 
     let _ = game.roll(10);
 
-    assert!(game.roll(11).is_err());
+    assert_eq!(game.roll(11), Err(Error::NotEnoughPinsLeft));;
 }
 
 #[test]
@@ -312,7 +312,7 @@ fn the_two_balls_after_a_final_strike_can_not_score_an_invalid_number_of_pins()
     let _ = game.roll(10);
 
     assert!(game.roll(5).is_ok());
-    assert!(game.roll(6).is_err());
+    assert_eq!(game.roll(6), Err(Error::NotEnoughPinsLeft));;
 }
 
 #[test]
@@ -342,7 +342,7 @@ fn the_two_balls_after_a_final_strike_can_not_be_a_non_strike_followed_by_a_stri
     let _ = game.roll(10);
 
     assert!(game.roll(6).is_ok());
-    assert!(game.roll(10).is_err());
+    assert_eq!(game.roll(10), Err(Error::NotEnoughPinsLeft));;
 }
 
 #[test]
@@ -357,7 +357,7 @@ fn second_bonus_ball_after_a_final_strike_can_not_score_an_invalid_number_of_pin
     let _ = game.roll(10);
 
     assert!(game.roll(10).is_ok());
-    assert!(game.roll(11).is_err());
+    assert_eq!(game.roll(11), Err(Error::NotEnoughPinsLeft));;
 }
 
 #[test]
@@ -371,15 +371,15 @@ fn if_the_last_frame_is_a_strike_you_can_not_score_before_the_extra_rolls_are_ta
 
     let _ = game.roll(10);
 
-    assert!(game.score().is_err());
+    assert_eq!(game.score(), None);
 
     let _ = game.roll(10);
 
-    assert!(game.score().is_err());
+    assert_eq!(game.score(), None);
 
     let _ = game.roll(10);
 
-    assert!(game.score().is_ok());
+    assert!(game.score().is_some());
 }
 
 #[test]
@@ -394,9 +394,9 @@ fn if_the_last_frame_is_a_spare_you_can_not_create_a_score_before_extra_roll_is_
     let _ = game.roll(5);
     let _ = game.roll(5);
 
-    assert!(game.score().is_err());
+    assert_eq!(game.score(), None);
 
     let _ = game.roll(10);
 
-    assert!(game.score().is_ok());
+    assert!(game.score().is_some());
 }

data/tracks/rust/exercises/bracket-push/README.md

@@ -35,7 +35,7 @@ haven't already, it will help you with organizing your files.
 
 ## Feedback, Issues, Pull Requests
 
-The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the [rust track team](https://github.com/orgs/exercism/teams/rust) are happy to help!
+The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the rust track team are happy to help!
 
 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).
 

data/tracks/rust/exercises/circular-buffer/README.md

@@ -74,7 +74,7 @@ haven't already, it will help you with organizing your files.
 
 ## Feedback, Issues, Pull Requests
 
-The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the [rust track team](https://github.com/orgs/exercism/teams/rust) are happy to help!
+The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the rust track team are happy to help!
 
 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).
 

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

@@ -42,7 +42,7 @@ haven't already, it will help you with organizing your files.
 
 ## Feedback, Issues, Pull Requests
 
-The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the [rust track team](https://github.com/orgs/exercism/teams/rust) are happy to help!
+The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the rust track team are happy to help!
 
 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).
 

data/tracks/rust/exercises/collatz-conjecture/README.md

@@ -50,7 +50,7 @@ haven't already, it will help you with organizing your files.
 
 ## Feedback, Issues, Pull Requests
 
-The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the [rust track team](https://github.com/orgs/exercism/teams/rust) are happy to help!
+The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the rust track team are happy to help!
 
 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).
 

data/tracks/rust/exercises/crypto-square/README.md

@@ -93,7 +93,7 @@ haven't already, it will help you with organizing your files.
 
 ## Feedback, Issues, Pull Requests
 
-The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the [rust track team](https://github.com/orgs/exercism/teams/rust) are happy to help!
+The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the rust track team are happy to help!
 
 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).
 

data/tracks/rust/exercises/crypto-square/example.rs

@@ -40,10 +40,18 @@ fn prepare(input: &str) -> Vec<char> {
     output.extend(
         input
             .chars()
-            .filter(|&c| c.is_ascii() && !c.is_whitespace())
-            .map(|c| c.to_ascii_lowercase())
-            .filter(|&c| c >= 'a' && c <= 'z'),
+            .filter(|&c| c.is_ascii() && !c.is_whitespace() && !c.is_ascii_punctuation())
+            .map(|c| c.to_ascii_lowercase()),
     );
+
+    // add space padding to the end such that the actual string returned
+    // forms a perfect rectangle
+    let (r, c) = dimensions(output.len());
+    let padding_qty = (r * c) - output.len();
+    for _ in 0..padding_qty {
+        output.push(' ');
+    }
+
     output.shrink_to_fit();
 
     output

data/tracks/rust/exercises/crypto-square/tests/crypto-square.rs

@@ -10,7 +10,6 @@ fn test_empty_input() {
     test("", "")
 }
 
-
 #[test]
 #[ignore]
 fn test_encrypt_also_decrypts_square() {
@@ -28,7 +27,7 @@ fn test_encrypt_also_decrypts_square() {
 fn test_example() {
     test(
         "If man was meant to stay on the ground, god would have given us roots.",
-        "imtgdvs fearwer mayoogo anouuio ntnnlvt wttddes aohghn sseoau",
+        "imtgdvs fearwer mayoogo anouuio ntnnlvt wttddes aohghn  sseoau ",
     )
 }
 
@@ -54,15 +53,6 @@ fn test_everything_becomes_lowercase() {
     test("CASE", "cs ae");
 }
 
-#[test]
-#[ignore]
-fn test_ignore_non_ascii_chars() {
-    test(
-        "She got her education, then got rich programming: 👩‍🎓🎓👩‍💻💰",
-        "setnhm hrigpm eeoori gdnton outrgg tchir haeca",
-    );
-}
-
 #[test]
 #[ignore]
 fn test_long() {
@@ -79,10 +69,12 @@ and the others, too.
 
 -- John F. Kennedy, 12 September 1962
         "#,
-        &(String::from("wohaseagabnttenwan eoennaronedcwpghnf cnmdoseaisshettidk ") +
-              "hwodtyhlztkaaoocte oeoobbaweoilrnphhn ocnteuriaflleeowen shihctdlnolewwseoe " +
-              "eoneabbldusnietitd totoueesmrbglapnhy oshtscceeeeelrotes geiheaaranciienere " +
-              "otsetuuvseasnuensp todrhsseuruognadtt ogeteeetrgsntwntoe tochyttoeieeoidoom " +
-              "htaiahhotettalowjb eodnrearhshhclnioe mtegeytgeaaacienhr"),
+        &(String::from("womdbudlmecsgwdwob enooetbsenaotioihe ")
+            + "cwotcbeeaeunolnnnr henhaecrsrsealeaf1 ocieucavugetciwnk9 "
+            + "ohnosauerithcnhde6 sotteusteehaegitn2 eohhtseotsatptchn  "
+            + "tsiehetohatwtohee  oesrethrenceopwod  gtdtyhagbdhanoety  "
+            + "ooehaetaesaresih1  tgcirygnsklewtne2  ooaneaoitilweptrs  "
+            + "ttdgerazoleiaoese  hoesaeleflnlrnntp  etanshwaosgleedot  "
+            + "mhnoyainubeiuatoe  oedtbrldreinnnojm "),
     )
 }

data/tracks/rust/exercises/custom-set/README.md

@@ -31,7 +31,7 @@ haven't already, it will help you with organizing your files.
 
 ## Feedback, Issues, Pull Requests
 
-The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the [rust track team](https://github.com/orgs/exercism/teams/rust) are happy to help!
+The [exercism/rust](https://github.com/exercism/rust) repository on GitHub is the home for all of the Rust exercises. If you have feedback about an exercise, or want to help implement new exercises, head over there and create an issue. Members of the rust track team are happy to help!
 
 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).
 

data/tracks/rust/exercises/custom-set/example.rs

@@ -11,10 +11,10 @@ impl<T: Ord + Clone> PartialEq for CustomSet<T> {
 }
 
 impl<T: Ord + Clone> CustomSet<T> {
-    pub fn new(inputs: Vec<T>) -> CustomSet<T> {
+    pub fn new(inputs: &[T]) -> CustomSet<T> {
         let mut s = CustomSet { collection: Vec::new() };
         for input in inputs {
-            s.add(input);
+            s.add(input.clone());
         }
         s
     }
@@ -42,26 +42,26 @@ impl<T: Ord + Clone> CustomSet<T> {
     }
 
     pub fn intersection(&self, other: &Self) -> CustomSet<T> {
-        CustomSet::new(self.collection
-                           .iter()
-                           .cloned()
-                           .filter(|c| other.contains(c))
-                           .collect())
+        CustomSet::new(&self.collection
+                            .iter()
+                            .cloned()
+                            .filter(|c| other.contains(c))
+                            .collect::<Vec<_>>())
     }
 
     pub fn union(&self, other: &Self) -> CustomSet<T> {
-        CustomSet::new(self.collection
-                           .iter()
-                           .cloned()
-                           .chain(other.collection.iter().cloned())
-                           .collect())
+        CustomSet::new(&self.collection
+                            .iter()
+                            .cloned()
+                            .chain(other.collection.iter().cloned())
+                            .collect::<Vec<_>>())
     }
 
     pub fn difference(&self, other: &Self) -> CustomSet<T> {
-        CustomSet::new(self.collection
-                           .iter()
-                           .cloned()
-                           .filter(|c| !other.contains(c))
-                           .collect())
+        CustomSet::new(&self.collection
+                            .iter()
+                            .cloned()
+                            .filter(|c| !other.contains(c))
+                            .collect::<Vec<_>>())
     }
 }