exercism · petertseng · Dec 17, 2018 · Dec 10, 2018 · Dec 10, 2018 · Dec 10, 2018
diff --git a/exercises/accumulate/Cargo.toml b/exercises/accumulate/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "accumulate"
 version = "0.0.0"
 

diff --git a/exercises/accumulate/tests/accumulate.rs b/exercises/accumulate/tests/accumulate.rs
@@ -59,11 +59,10 @@ fn mutating_closure() {
     let mut counter = 0;
     let input = vec![-2, 3, 4, -5];
     let expected = vec![2, 3, 4, 5];
-    let result = map(input,
-        |x: i64| {
-            counter += 1;
-            x.abs()
-        });
+    let result = map(input, |x: i64| {
+        counter += 1;
+        x.abs()
+    });
     assert_eq!(result, expected);
     assert_eq!(counter, 4);
 }

diff --git a/exercises/acronym/Cargo.toml b/exercises/acronym/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "acronym"
 version = "1.0.0"
 

diff --git a/exercises/acronym/tests/acronym.rs b/exercises/acronym/tests/acronym.rs
@@ -1,4 +1,4 @@
-extern crate acronym;
+use acronym;
 
 #[test]
 fn empty() {

diff --git a/exercises/all-your-base/Cargo.toml b/exercises/all-your-base/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "allyourbase"
 version = "1.0.0"
diff --git a/exercises/all-your-base/tests/all-your-base.rs b/exercises/all-your-base/tests/all-your-base.rs
@@ -1,4 +1,4 @@
-extern crate allyourbase as ayb;
+use allyourbase as ayb;
 
 #[test]
 fn single_bit_one_to_decimal() {

diff --git a/exercises/allergies/Cargo.toml b/exercises/allergies/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "allergies"
 version = "1.1.0"
 
diff --git a/exercises/allergies/tests/allergies.rs b/exercises/allergies/tests/allergies.rs
@@ -1,5 +1,3 @@
-extern crate allergies;
-
 use allergies::*;
 
 fn compare_allergy_vectors(expected: &[Allergen], actual: &[Allergen]) {

diff --git a/exercises/alphametics/Cargo-example.toml b/exercises/alphametics/Cargo-example.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "alphametics"
 version = "0.0.0"
 

diff --git a/exercises/alphametics/Cargo.toml b/exercises/alphametics/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "alphametics"
 version = "1.3.0"
diff --git a/exercises/alphametics/example.rs b/exercises/alphametics/example.rs
@@ -10,12 +10,20 @@ use std::char;
 use std::collections::HashMap;
 use std::collections::HashSet;
 
-fn test_equation(coefficients: &HashMap<char, i64>, cant_be_zero: &HashSet<char>, substitutions: &HashMap<char, u8>) -> bool {
+fn test_equation(
+    coefficients: &HashMap<char, i64>,
+    cant_be_zero: &HashSet<char>,
+    substitutions: &HashMap<char, u8>,
+) -> bool {
     if cant_be_zero.iter().any(|d| substitutions[d] == 0) {
         return false;
     }
 
-    coefficients.iter().map(|(d, &coeff)| i64::from(substitutions[d]) * coeff).sum::<i64>() == 0
+    coefficients
+        .iter()
+        .map(|(d, &coeff)| i64::from(substitutions[d]) * coeff)
+        .sum::<i64>()
+        == 0
 }
 
 fn letter_coefficients(puzzle: &str) -> (HashMap<char, i64>, HashSet<char>) {

diff --git a/exercises/alphametics/tests/alphametics.rs b/exercises/alphametics/tests/alphametics.rs
@@ -1,4 +1,4 @@
-extern crate alphametics;
+use alphametics;
 use std::collections::HashMap;
 
 fn assert_alphametic_solution_eq(puzzle: &str, solution: &[(char, u8)]) {
@@ -29,7 +29,10 @@ fn test_leading_zero_solution_is_invalid() {
 #[test]
 #[ignore]
 fn puzzle_with_two_digits_final_carry() {
-    assert_alphametic_solution_eq("A + A + A + A + A + A + A + A + A + A + A + B == BCC", &[('A', 9), ('B', 1), ('C', 0)]);
+    assert_alphametic_solution_eq(
+        "A + A + A + A + A + A + A + A + A + A + A + B == BCC",
+        &[('A', 9), ('B', 1), ('C', 0)],
+    );
 }
 
 #[test]

diff --git a/exercises/anagram/Cargo.toml b/exercises/anagram/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "anagram"
 version = "0.0.0"
diff --git a/exercises/anagram/tests/anagram.rs b/exercises/anagram/tests/anagram.rs
@@ -1,4 +1,4 @@
-extern crate anagram;
+use anagram;
 
 use std::collections::HashSet;
 use std::iter::FromIterator;

diff --git a/exercises/armstrong-numbers/Cargo.toml b/exercises/armstrong-numbers/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "armstrong_numbers"
 version = "1.0.0"
diff --git a/exercises/armstrong-numbers/example.rs b/exercises/armstrong-numbers/example.rs
@@ -3,5 +3,6 @@ pub fn is_armstrong_number(num: u32) -> bool {
     let l = s.len();
     s.chars()
         .map(|c| c.to_digit(10).unwrap().pow(l as u32))
-        .sum::<u32>() == num
+        .sum::<u32>()
+        == num
 }
diff --git a/exercises/armstrong-numbers/tests/armstrong-numbers.rs b/exercises/armstrong-numbers/tests/armstrong-numbers.rs
@@ -1,4 +1,3 @@
-extern crate armstrong_numbers;
 use armstrong_numbers::*;
 
 #[test]

diff --git a/exercises/atbash-cipher/Cargo.toml b/exercises/atbash-cipher/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "atbash-cipher"
 version = "1.1.0"
diff --git a/exercises/atbash-cipher/tests/atbash-cipher.rs b/exercises/atbash-cipher/tests/atbash-cipher.rs
@@ -1,4 +1,4 @@
-extern crate atbash_cipher as cipher;
+use atbash_cipher as cipher;
 
 #[test]
 fn test_encode_yes() {

diff --git a/exercises/beer-song/Cargo.toml b/exercises/beer-song/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "beer-song"
 version = "0.0.0"
diff --git a/exercises/beer-song/tests/beer-song.rs b/exercises/beer-song/tests/beer-song.rs
@@ -1,4 +1,4 @@
-extern crate beer_song as beer;
+use beer_song as beer;
 
 #[test]
 fn test_verse_0() {

diff --git a/exercises/binary-search/Cargo.toml b/exercises/binary-search/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "binary-search"
 version = "1.3.0"
 

diff --git a/exercises/binary-search/tests/binary-search.rs b/exercises/binary-search/tests/binary-search.rs
@@ -1,5 +1,3 @@
-extern crate binary_search;
-
 use binary_search::find;
 
 #[test]

diff --git a/exercises/bob/Cargo.toml b/exercises/bob/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "bob"
 version = "1.4.0"
diff --git a/exercises/bob/tests/bob.rs b/exercises/bob/tests/bob.rs
@@ -1,4 +1,4 @@
-extern crate bob;
+use bob;
 
 fn process_response_case(phrase: &str, expected_response: &str) {
     assert_eq!(bob::reply(phrase), expected_response);

diff --git a/exercises/book-store/Cargo-example.toml b/exercises/book-store/Cargo-example.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "book_store"
 version = "1.3.0"
 

diff --git a/exercises/book-store/Cargo.toml b/exercises/book-store/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "book_store"
 version = "1.3.0"
 

diff --git a/exercises/book-store/example.rs b/exercises/book-store/example.rs
@@ -25,13 +25,16 @@ impl Group {
     }
 
     fn price(&self) -> Price {
-        (self.0.borrow().len() as Price) * BOOK_PRICE * match self.0.borrow().len() {
-            2 => 95,
-            3 => 90,
-            4 => 80,
-            5 => 75,
-            _ => 100,
-        } / 100
+        (self.0.borrow().len() as Price)
+            * BOOK_PRICE
+            * match self.0.borrow().len() {
+                2 => 95,
+                3 => 90,
+                4 => 80,
+                5 => 75,
+                _ => 100,
+            }
+            / 100
     }
 }
 

diff --git a/exercises/book-store/tests/book-store.rs b/exercises/book-store/tests/book-store.rs
@@ -5,7 +5,6 @@
 //! [script]: https://github.com/exercism/rust/blob/master/bin/init_exercise.py
 //! [canonical-data]: https://raw.githubusercontent.com/exercism/problem-specifications/master/exercises/book-store/canonical_data.json
 
-extern crate book_store;
 use book_store::*;
 
 /// Process a single test case for the property `total`

diff --git a/exercises/bowling/Cargo.toml b/exercises/bowling/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "bowling"
 version = "1.2.0"
diff --git a/exercises/bowling/tests/bowling.rs b/exercises/bowling/tests/bowling.rs
@@ -1,5 +1,3 @@
-extern crate bowling;
-
 use bowling::*;
 
 #[test]

diff --git a/exercises/bracket-push/Cargo.toml b/exercises/bracket-push/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "bracket-push"
 version = "1.5.0"
diff --git a/exercises/bracket-push/example.rs b/exercises/bracket-push/example.rs
@@ -57,7 +57,8 @@ impl From<Vec<(char, char)>> for MatchingBrackets {
 
 impl MatchingBrackets {
     fn contains(&self, other: &char) -> bool {
-        let known = self.collection
+        let known = self
+            .collection
             .keys()
             .chain(self.collection.values())
             .collect::<Vec<_>>();

diff --git a/exercises/bracket-push/src/lib.rs b/exercises/bracket-push/src/lib.rs
@@ -1,3 +1,6 @@
 pub fn brackets_are_balanced(string: &str) -> bool {
-    unimplemented!("Check if the string \"{}\" contains balanced brackets", string);
+    unimplemented!(
+        "Check if the string \"{}\" contains balanced brackets",
+        string
+    );
 }
diff --git a/exercises/bracket-push/tests/bracket-push.rs b/exercises/bracket-push/tests/bracket-push.rs
@@ -1,5 +1,3 @@
-extern crate bracket_push;
-
 use bracket_push::brackets_are_balanced;
 
 #[test]

diff --git a/exercises/circular-buffer/Cargo.toml b/exercises/circular-buffer/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "circular-buffer"
 version = "1.1.0"
diff --git a/exercises/circular-buffer/tests/circular-buffer.rs b/exercises/circular-buffer/tests/circular-buffer.rs
@@ -1,4 +1,3 @@
-extern crate circular_buffer;
 use circular_buffer::{CircularBuffer, Error};
 
 #[test]

diff --git a/exercises/clock/Cargo.toml b/exercises/clock/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "clock"
 version = "2.4.0"
 

diff --git a/exercises/collatz-conjecture/Cargo.toml b/exercises/collatz-conjecture/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "collatz_conjecture"
 version = "1.2.1"
diff --git a/exercises/collatz-conjecture/tests/collatz-conjecture.rs b/exercises/collatz-conjecture/tests/collatz-conjecture.rs
@@ -1,5 +1,3 @@
-extern crate collatz_conjecture;
-
 use collatz_conjecture::*;
 
 #[test]

diff --git a/exercises/crypto-square/Cargo-example.toml b/exercises/crypto-square/Cargo-example.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "crypto-square"
 version = "0.1.0"
 

diff --git a/exercises/crypto-square/Cargo.toml b/exercises/crypto-square/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "crypto-square"
 version = "0.1.0"
 

diff --git a/exercises/crypto-square/tests/crypto-square.rs b/exercises/crypto-square/tests/crypto-square.rs
@@ -1,4 +1,3 @@
-extern crate crypto_square;
 use crypto_square::encrypt;
 
 fn test(input: &str, output: &str) {

diff --git a/exercises/custom-set/Cargo.toml b/exercises/custom-set/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
+edition = "2018"
 name = "custom-set"
 version = "1.0.1"
diff --git a/exercises/custom-set/example.rs b/exercises/custom-set/example.rs
@@ -44,26 +44,35 @@ 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::<Vec<_>>())
+        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::<Vec<_>>())
+        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::<Vec<_>>())
+        CustomSet::new(
+            &self
+                .collection
+                .iter()
+                .cloned()
+                .filter(|c| !other.contains(c))
+                .collect::<Vec<_>>(),
+        )
     }
 }
diff --git a/exercises/decimal/Cargo-example.toml b/exercises/decimal/Cargo-example.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "decimal"
 version = "0.1.0"
 

diff --git a/exercises/decimal/Cargo.toml b/exercises/decimal/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "decimal"
 version = "0.1.0"
 

diff --git a/exercises/decimal/example.rs b/exercises/decimal/example.rs
@@ -87,7 +87,8 @@ impl Decimal {
     ///
     /// This reduces the decimal index, so that the raw values are easier to parse
     fn reduce(&mut self) {
-        let extra_zeroes = self.digits
+        let extra_zeroes = self
+            .digits
             .to_string() // produce a decimal representation
             .chars()
             .rev() // trailing values

diff --git a/exercises/diamond/Cargo.toml b/exercises/diamond/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "diamond"
 version = "1.1.0"