f rename for people with terrible terminal fonts

Author: TheBlueMatt

lightning/src/util/ser.rs

@@ -391,8 +391,8 @@ impl Readable for BigSize {
 /// To ensure we only have one valid encoding per value, we add 0xffff to values written as eight
 /// bytes. Thus, 0xfffe is serialized as 0xfffe, whereas 0xffff is serialized as
 /// 0xffff0000000000000000 (i.e. read-eight-bytes then zero).
-struct U16OrU64(pub u64);
-impl Writeable for U16OrU64 {
+struct CollectionLength(pub u64);
+impl Writeable for CollectionLength {
 	#[inline]
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 		if self.0 < 0xffff {
@@ -404,15 +404,15 @@ impl Writeable for U16OrU64 {
 	}
 }
 
-impl Readable for U16OrU64 {
+impl Readable for CollectionLength {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let mut val: u64 = <u16 as Readable>::read(r)? as u64;
 		if val == 0xffff {
 			val = <u64 as Readable>::read(r)?
 				.checked_add(0xffff).ok_or(DecodeError::InvalidValue)?;
 		}
-		Ok(U16OrU64(val))
+		Ok(CollectionLength(val))
 	}
 }
 
@@ -630,7 +630,7 @@ macro_rules! impl_for_map {
 		{
 			#[inline]
 			fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-				U16OrU64(self.len() as u64).write(w)?;
+				CollectionLength(self.len() as u64).write(w)?;
 				for (key, value) in self.iter() {
 					key.write(w)?;
 					value.write(w)?;
@@ -644,7 +644,7 @@ macro_rules! impl_for_map {
 		{
 			#[inline]
 			fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-				let len: U16OrU64 = Readable::read(r)?;
+				let len: CollectionLength = Readable::read(r)?;
 				let mut ret = $constr(len.0 as usize);
 				for _ in 0..len.0 {
 					let k = K::read(r)?;
@@ -670,7 +670,7 @@ where T: Writeable + Eq + Hash
 {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-		U16OrU64(self.len() as u64).write(w)?;
+		CollectionLength(self.len() as u64).write(w)?;
 		for item in self.iter() {
 			item.write(w)?;
 		}
@@ -683,7 +683,7 @@ where T: Readable + Eq + Hash
 {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		let len: U16OrU64 = Readable::read(r)?;
+		let len: CollectionLength = Readable::read(r)?;
 		let mut ret = HashSet::with_capacity(cmp::min(len.0 as usize, MAX_BUF_SIZE / core::mem::size_of::<T>()));
 		for _ in 0..len.0 {
 			if !ret.insert(T::read(r)?) {
@@ -700,7 +700,7 @@ macro_rules! impl_for_vec {
 		impl<$($name : Writeable),*> Writeable for Vec<$ty> {
 			#[inline]
 			fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-				U16OrU64(self.len() as u64).write(w)?;
+				CollectionLength(self.len() as u64).write(w)?;
 				for elem in self.iter() {
 					elem.write(w)?;
 				}
@@ -711,7 +711,7 @@ macro_rules! impl_for_vec {
 		impl<$($name : Readable),*> Readable for Vec<$ty> {
 			#[inline]
 			fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-				let len: U16OrU64 = Readable::read(r)?;
+				let len: CollectionLength = Readable::read(r)?;
 				let mut ret = Vec::with_capacity(cmp::min(len.0 as usize, MAX_BUF_SIZE / core::mem::size_of::<$ty>()));
 				for _ in 0..len.0 {
 					if let Some(val) = MaybeReadable::read(r)? {
@@ -727,15 +727,15 @@ macro_rules! impl_for_vec {
 impl Writeable for Vec<u8> {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-		U16OrU64(self.len() as u64).write(w)?;
+		CollectionLength(self.len() as u64).write(w)?;
 		w.write_all(&self)
 	}
 }
 
 impl Readable for Vec<u8> {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		let mut len: U16OrU64 = Readable::read(r)?;
+		let mut len: CollectionLength = Readable::read(r)?;
 		let mut ret = Vec::new();
 		while len.0 > 0 {
 			let readamt = cmp::min(len.0 as usize, MAX_BUF_SIZE);
@@ -1078,7 +1078,7 @@ impl Readable for () {
 impl Writeable for String {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-		U16OrU64(self.len() as u64).write(w)?;
+		CollectionLength(self.len() as u64).write(w)?;
 		w.write_all(self.as_bytes())
 	}
 }