Merge pull request chris-morgan#63 from Rust-Skane/master

Make test_utils.rs work with latest Rust

Author: chris-morgan

src/http/headers/test_utils.rs

@@ -1,5 +1,6 @@
 use std::io::{MemReader, MemWriter};
 use std::str;
+use std::fmt;
 use headers::{HeaderConvertible, HeaderValueByteIterator};
 
 pub fn from_stream_with_str<T: HeaderConvertible>(s: &str) -> Option<T> {
@@ -18,14 +19,14 @@ pub fn to_stream_into_str<T: HeaderConvertible>(v: &T) -> ~str {
 
 // Verify that a value cannot be successfully interpreted as a header value of the specified type.
 #[inline]
-pub fn assert_invalid<T: HeaderConvertible>(string: &str) {
+pub fn assert_invalid<T: HeaderConvertible + fmt::Show>(string: &str) {
     assert_eq!(from_stream_with_str::<T>(string), None);
 }
 
 // Verify that all of the methods from the HeaderConvertible trait work correctly for the given
 // valid header value and correct decoded value.
 #[inline]
-pub fn assert_conversion_correct<T: HeaderConvertible>(string: &'static str, value: T) {
+pub fn assert_conversion_correct<T: HeaderConvertible + fmt::Show>(string: &'static str, value: T) {
     assert_eq!(from_stream_with_str(string), Some(value.clone()));
     let s = to_stream_into_str(&value);
     assert_eq!(s.as_slice(), string);
@@ -35,6 +36,6 @@ pub fn assert_conversion_correct<T: HeaderConvertible>(string: &'static str, val
 
 // Verify that from_stream interprets the given valid header value correctly.
 #[inline]
-pub fn assert_interpretation_correct<T: HeaderConvertible>(string: &'static str, value: T) {
+pub fn assert_interpretation_correct<T: HeaderConvertible + fmt::Show>(string: &'static str, value: T) {
     assert_eq!(from_stream_with_str(string), Some(value));
 }