merged with master

2016-10-31 01:07:13 +01:00 · 2016-10-31 01:07:13 +01:00 · 260986da9c
parent 08a2a93d9c
commit 260986da9c
1 changed files with 1 additions and 1 deletions
--- a/message/src/common/inventory.rs
+++ b/message/src/common/inventory.rs
@ -38,7 +38,7 @@ impl Serializable for InventoryType {
 }

 impl Deserializable for InventoryType {
-	fn deserialize(reader: &mut Reader) -> Result<Self, ReaderError> where Self: Sized {
+	fn deserialize<T>(reader: &mut Reader<T>) -> Result<Self, ReaderError> where T: io::Read {
 		let t: u32 = try!(reader.read());
 		InventoryType::from_u32(t).ok_or(ReaderError::MalformedData)
 	}