grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes and renaming fax->copy.

Browse Source
This commit is contained in:
Gav Wood 2016-01-08 12:05:38 +01:00
parent f81fb2de51
commit e4ed6467a9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bytes.rs
View File

@ -329,7 +329,7 @@ pub trait Populatable {
/// Copies a bunch of bytes `d` to `self`, overwriting as necessary. /// Copies a bunch of bytes `d` to `self`, overwriting as necessary.
/// ///
/// If `d` is smaller, will leave some bytes untouched. /// If `d` is smaller, will leave some bytes untouched.
fn fax_raw(&mut self, d: &[u8]) { fn copy_raw(&mut self, d: &[u8]) {
use std::io::Write; use std::io::Write;
self.as_slice_mut().write(&d).unwrap(); self.as_slice_mut().write(&d).unwrap();
} }
@ -342,7 +342,7 @@ pub trait Populatable {
/// Copies the raw representation of an object `d` to `self`, overwriting as necessary. /// Copies the raw representation of an object `d` to `self`, overwriting as necessary.
/// ///
/// If `d` is smaller, will leave some bytes untouched. /// If `d` is smaller, will leave some bytes untouched.
fn fax_raw_from(&mut self, d: &BytesConvertable) { self.fax_raw(d.as_slice()); } fn copy_raw_from(&mut self, d: &BytesConvertable) { self.copy_raw(d.as_slice()); }
/// Get the raw slice for this object. /// Get the raw slice for this object.
fn as_slice_mut(&mut self) -> &mut [u8]; fn as_slice_mut(&mut self) -> &mut [u8];
@ -369,10 +369,10 @@ impl<T> Populatable for [T] where T: Sized {
#[test] #[test]
fn fax_raw() { fn fax_raw() {
let mut x = [255u8; 4]; let mut x = [255u8; 4];
x.fax_raw(&[1u8; 2][..]); x.copy_raw(&[1u8; 2][..]);
assert_eq!(x, [1u8, 1, 255, 255]); assert_eq!(x, [1u8, 1, 255, 255]);
let mut x = [255u8; 4]; let mut x = [255u8; 4];
x.fax_raw(&[1u8; 6][..]); x.copy_raw(&[1u8; 6][..]);
assert_eq!(x, [1u8, 1, 1, 1]); assert_eq!(x, [1u8, 1, 1, 1]);
} }
@ -399,10 +399,10 @@ fn populate_raw_dyn() {
#[test] #[test]
fn fax_raw_dyn() { fn fax_raw_dyn() {
let mut x = [255u8; 4]; let mut x = [255u8; 4];
x.fax_raw(&[1u8; 2][..]); x.copy_raw(&[1u8; 2][..]);
assert_eq!(&x[..], [1u8, 1, 255, 255]); assert_eq!(&x[..], [1u8, 1, 255, 255]);
let mut x = [255u8; 4]; let mut x = [255u8; 4];
x.fax_raw(&[1u8; 6][..]); x.copy_raw(&[1u8; 6][..]);
assert_eq!(&x[..], [1u8, 1, 1, 1]); assert_eq!(&x[..], [1u8, 1, 1, 1]);
} }
@ -414,6 +414,6 @@ fn populate_big_types() {
h.populate_raw_from(&a); h.populate_raw_from(&a);
assert_eq!(h, h256_from_hex("ffffffffffffffffffffffffffffffffffffffff000000000000000000000000")); assert_eq!(h, h256_from_hex("ffffffffffffffffffffffffffffffffffffffff000000000000000000000000"));
let mut h = h256_from_u64(0x69); let mut h = h256_from_u64(0x69);
h.fax_raw_from(&a); h.copy_raw_from(&a);
assert_eq!(h, h256_from_hex("ffffffffffffffffffffffffffffffffffffffff000000000000000000000069")); assert_eq!(h, h256_from_hex("ffffffffffffffffffffffffffffffffffffffff000000000000000000000069"));
} }