get this compiling again

1 files changed, 20 insertions, 13 deletions

diff --git a/tests/set1.rs b/tests/set1.rs
index c9eece7..e1dacd1 100644
--- a/tests/set1.rs
+++ b/tests/set1.rs
@@ -6,10 +6,12 @@ use serialize::hex::FromHex;
 mod util;
 
 #[test]
-fn problem_1 () {
+fn problem_1() {
     let hex = "49276d206b696c6c696e6720796f757220627261\
                696e206c696b65206120706f69736f6e6f757320\
-               6d757368726f6f6d".from_hex().unwrap();
+               6d757368726f6f6d"
+        .from_hex()
+        .unwrap();
     let base64 = "SSdtIGtpbGxpbmcgeW91ciBicmFpbiBsaWtlIGEg\
                   cG9pc29ub3VzIG11c2hyb29t";
     let got = matasano::to_base64(&hex[..]);
@@ -17,7 +19,7 @@ fn problem_1 () {
 }
 
 #[test]
-fn problem_2 () {
+fn problem_2() {
     let bytes1 = "1c0111001f010100061a024b53535009181c".from_hex().unwrap();
     let bytes2 = "686974207468652062756c6c277320657965".from_hex().unwrap();
     let expected = "746865206b696420646f6e277420706c6179".from_hex().unwrap();
@@ -26,16 +28,18 @@ fn problem_2 () {
 }
 
 #[test]
-fn problem_3 () {
+fn problem_3() {
     let ciphertext = "1b37373331363f78151b7f2b783431333d783978\
-                      28372d363c78373e783a393b3736".from_hex().unwrap();
+                      28372d363c78373e783a393b3736"
+        .from_hex()
+        .unwrap();
     let plaintext = b"Cooking MC's like a pound of bacon";
     let got = matasano::crack_single_byte_xor(&ciphertext[..]);
     assert_eq!(got, &plaintext[..]);
 }
 
 #[test]
-fn problem_4 () {
+fn problem_4() {
     let possibles = util::read_as_hex_lines("data/4.txt");
     let plaintext = b"Now that the party is jumping\n";
     let got = matasano::find_single_byte_xor_encrypted_string(&possibles[..]);
@@ -43,20 +47,22 @@ fn problem_4 () {
 }
 
 #[test]
-fn problem_5 () {
+fn problem_5() {
     let plaintext = b"Burning 'em, if you ain't quick and nimble\n\
                     I go crazy when I hear a cymbal";
     let key = b"ICE";
     let ciphertext = "0b3637272a2b2e63622c2e69692a23693a2a3c63\
                       24202d623d63343c2a26226324272765272a282b\
                       2f20430a652e2c652a3124333a653e2b2027630c\
-                      692b20283165286326302e27282f".from_hex().unwrap();
+                      692b20283165286326302e27282f"
+        .from_hex()
+        .unwrap();
     let got = matasano::repeating_key_xor(plaintext, key);
     assert_eq!(got, ciphertext);
 }
 
 #[test]
-fn problem_6 () {
+fn problem_6() {
     let ciphertext = util::read_as_base64("data/6.txt");
     let plaintext = util::read("data/6.out.txt");
     let key = matasano::crack_repeating_key_xor(&ciphertext[..]);
@@ -65,16 +71,16 @@ fn problem_6 () {
 }
 
 #[test]
-fn problem_7 () {
+fn problem_7() {
     let ciphertext = util::read_as_base64("data/7.txt");
     let key = b"YELLOW SUBMARINE";
     let plaintext = util::read("data/7.out.txt");
     let got = matasano::decrypt_aes_128_ecb(&ciphertext[..], key);
-    assert_eq!(got, Some(plaintext));
+    assert_eq!(got, plaintext);
 }
 
 #[test]
-fn problem_8 () {
+fn problem_8() {
     let possibles = util::read_as_hex_lines("data/8.txt");
     let ciphertext = "d880619740a8a19b7840a8a31c810a3d08649af7\
                       0dc06f4fd5d2d69c744cd283e2dd052f6b641dbf\
@@ -84,7 +90,8 @@ fn problem_8 () {
                       8d6aecd566489154789a6b0308649af70dc06f4f\
                       d5d2d69c744cd283d403180c98c8f6db1f2a3f9c\
                       4040deb0ab51b29933f2c123c58386b06fba186a"
-                      .from_hex().unwrap();
+        .from_hex()
+        .unwrap();
     let got = matasano::find_aes_128_ecb_encrypted_string(&possibles[..]);
     assert_eq!(got, ciphertext);
 }