stop using rustc_serialize

1 files changed, 33 insertions, 30 deletions

diff --git a/tests/set1.rs b/tests/set1.rs
index f1db7e5..f8d0981 100644
--- a/tests/set1.rs
+++ b/tests/set1.rs
@@ -1,14 +1,13 @@
-use rustc_serialize::hex::FromHex;
-
 mod util;
 
 #[test]
 fn problem_1() {
-    let hex = "49276d206b696c6c696e6720796f757220627261\
-               696e206c696b65206120706f69736f6e6f757320\
-               6d757368726f6f6d"
-        .from_hex()
-        .unwrap();
+    let hex = hex::decode(
+        "49276d206b696c6c696e6720796f757220627261\
+         696e206c696b65206120706f69736f6e6f757320\
+         6d757368726f6f6d",
+    )
+    .unwrap();
     let base64 = "SSdtIGtpbGxpbmcgeW91ciBicmFpbiBsaWtlIGEg\
                   cG9pc29ub3VzIG11c2hyb29t";
     let got = matasano::to_base64(&hex[..]);
@@ -17,19 +16,21 @@ fn problem_1() {
 
 #[test]
 fn problem_2() {
-    let bytes1 = "1c0111001f010100061a024b53535009181c".from_hex().unwrap();
-    let bytes2 = "686974207468652062756c6c277320657965".from_hex().unwrap();
-    let expected = "746865206b696420646f6e277420706c6179".from_hex().unwrap();
+    let bytes1 = hex::decode("1c0111001f010100061a024b53535009181c").unwrap();
+    let bytes2 = hex::decode("686974207468652062756c6c277320657965").unwrap();
+    let expected =
+        hex::decode("746865206b696420646f6e277420706c6179").unwrap();
     let got = matasano::fixed_xor(&bytes1[..], &bytes2[..]);
     assert_eq!(got, expected);
 }
 
 #[test]
 fn problem_3() {
-    let ciphertext = "1b37373331363f78151b7f2b783431333d783978\
-                      28372d363c78373e783a393b3736"
-        .from_hex()
-        .unwrap();
+    let ciphertext = hex::decode(
+        "1b37373331363f78151b7f2b783431333d783978\
+         28372d363c78373e783a393b3736",
+    )
+    .unwrap();
     let plaintext = b"Cooking MC's like a pound of bacon";
     let got = matasano::crack_single_byte_xor(&ciphertext[..]);
     assert_eq!(got, &plaintext[..]);
@@ -48,12 +49,13 @@ 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();
+    let ciphertext = hex::decode(
+        "0b3637272a2b2e63622c2e69692a23693a2a3c63\
+         24202d623d63343c2a26226324272765272a282b\
+         2f20430a652e2c652a3124333a653e2b2027630c\
+         692b20283165286326302e27282f",
+    )
+    .unwrap();
     let got = matasano::repeating_key_xor(plaintext, key);
     assert_eq!(got, ciphertext);
 }
@@ -79,16 +81,17 @@ fn problem_7() {
 #[test]
 fn problem_8() {
     let possibles = util::read_as_hex_lines("data/8.txt");
-    let ciphertext = "d880619740a8a19b7840a8a31c810a3d08649af7\
-                      0dc06f4fd5d2d69c744cd283e2dd052f6b641dbf\
-                      9d11b0348542bb5708649af70dc06f4fd5d2d69c\
-                      744cd2839475c9dfdbc1d46597949d9c7e82bf5a\
-                      08649af70dc06f4fd5d2d69c744cd28397a93eab\
-                      8d6aecd566489154789a6b0308649af70dc06f4f\
-                      d5d2d69c744cd283d403180c98c8f6db1f2a3f9c\
-                      4040deb0ab51b29933f2c123c58386b06fba186a"
-        .from_hex()
-        .unwrap();
+    let ciphertext = hex::decode(
+        "d880619740a8a19b7840a8a31c810a3d08649af7\
+         0dc06f4fd5d2d69c744cd283e2dd052f6b641dbf\
+         9d11b0348542bb5708649af70dc06f4fd5d2d69c\
+         744cd2839475c9dfdbc1d46597949d9c7e82bf5a\
+         08649af70dc06f4fd5d2d69c744cd28397a93eab\
+         8d6aecd566489154789a6b0308649af70dc06f4f\
+         d5d2d69c744cd283d403180c98c8f6db1f2a3f9c\
+         4040deb0ab51b29933f2c123c58386b06fba186a",
+    )
+    .unwrap();
     let got = matasano::find_aes_128_ecb_encrypted_string(&possibles[..]);
     assert_eq!(got, ciphertext);
 }