From 4c12a9eed43b6c0a2c3b194a7201ba25e0b8432b Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 9 Apr 2019 03:04:54 -0400 Subject: stop using rustc_serialize --- tests/set2.rs | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'tests/set2.rs') diff --git a/tests/set2.rs b/tests/set2.rs index a8de407..04614de 100644 --- a/tests/set2.rs +++ b/tests/set2.rs @@ -2,7 +2,6 @@ use std::borrow::ToOwned; use std::collections::HashMap; use rand::Rng; -use rustc_serialize::base64::FromBase64; mod util; @@ -74,13 +73,14 @@ fn problem_11() { #[test] fn problem_12() { - let padding = b"Um9sbGluJyBpbiBteSA1LjAKV2l0aCBteSByYWct\ - dG9wIGRvd24gc28gbXkgaGFpciBjYW4gYmxvdwpU\ - aGUgZ2lybGllcyBvbiBzdGFuZGJ5IHdhdmluZyBq\ - dXN0IHRvIHNheSBoaQpEaWQgeW91IHN0b3A/IE5v\ - LCBJIGp1c3QgZHJvdmUgYnkK" - .from_base64() - .unwrap(); + let padding = base64::decode( + &b"Um9sbGluJyBpbiBteSA1LjAKV2l0aCBteSByYWct\ + dG9wIGRvd24gc28gbXkgaGFpciBjYW4gYmxvdwpU\ + aGUgZ2lybGllcyBvbiBzdGFuZGJ5IHdhdmluZyBq\ + dXN0IHRvIHNheSBoaQpEaWQgeW91IHN0b3A/IE5v\ + LCBJIGp1c3QgZHJvdmUgYnkK"[..], + ) + .unwrap(); let fixed_padding = |input: &[u8]| -> Vec { return input.iter().chain(padding.iter()).map(|x| *x).collect(); }; @@ -137,13 +137,14 @@ fn problem_13() { #[test] fn problem_14() { - let padding = b"Um9sbGluJyBpbiBteSA1LjAKV2l0aCBteSByYWct\ - dG9wIGRvd24gc28gbXkgaGFpciBjYW4gYmxvdwpU\ - aGUgZ2lybGllcyBvbiBzdGFuZGJ5IHdhdmluZyBq\ - dXN0IHRvIHNheSBoaQpEaWQgeW91IHN0b3A/IE5v\ - LCBJIGp1c3QgZHJvdmUgYnkK" - .from_base64() - .unwrap(); + let padding = base64::decode( + &b"Um9sbGluJyBpbiBteSA1LjAKV2l0aCBteSByYWct\ + dG9wIGRvd24gc28gbXkgaGFpciBjYW4gYmxvdwpU\ + aGUgZ2lybGllcyBvbiBzdGFuZGJ5IHdhdmluZyBq\ + dXN0IHRvIHNheSBoaQpEaWQgeW91IHN0b3A/IE5v\ + LCBJIGp1c3QgZHJvdmUgYnkK"[..], + ) + .unwrap(); let front_padding: Vec = rand::thread_rng() .sample_iter(&rand::distributions::Standard) .take(rand::thread_rng().gen_range(1, 100)) -- cgit v1.2.3-54-g00ecf