Rename internal field 'array' to 'pixels'

Pixels is a more accurate name for a vector containing pixel data.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/lib.rs b/src/lib.rs
index fe5d57a..008acb9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,25 +5,25 @@ pub type Rect = geometry::Rect<i32, u32>;
 pub use geometry::HasDimensions;
 
 pub struct Buffer {
-    array: Vec<Colour>,
+    pixels: Vec<Colour>,
     dimensions: Dimensions,
 }
 
 impl Buffer {
-    pub const ZERO: Buffer = Buffer { array: Vec::new(), dimensions: Dimensions::ZERO };
+    pub const ZERO: Buffer = Buffer { pixels: Vec::new(), dimensions: Dimensions::ZERO };
 
     pub fn new(dimensions: Dimensions) -> Self {
-        let array = vec![Colour::BLACK; dimensions.area_usize()];
-        Self { array, dimensions }
+        let pixels = vec![Colour::BLACK; dimensions.area_usize()];
+        Self { pixels, dimensions }
     }
 
     pub fn new_with_fill(dimensions: Dimensions, colour: Colour) -> Self {
-        let array = vec![colour; dimensions.area_usize()];
-        Self { array, dimensions }
+        let pixels = vec![colour; dimensions.area_usize()];
+        Self { pixels, dimensions }
     }
 
     pub fn fill(&mut self, colour: Colour) {
-        self.array.iter_mut().for_each(|c| *c = colour);
+        self.pixels.iter_mut().for_each(|c| *c = colour);
     }
 
     pub fn copy_into(&mut self, coords: Point, other: &Buffer) {
@@ -54,24 +54,24 @@ impl Buffer {
     }
 
     pub fn resize(&mut self, dimensions: Dimensions) {
-        self.array.resize(dimensions.area_usize(), Colour::BLACK);
+        self.pixels.resize(dimensions.area_usize(), Colour::BLACK);
         self.dimensions = dimensions;
     }
 
     pub fn as_rows(&self) -> std::slice::ChunksExact<Colour> {
-        self.array.chunks_exact(self.dimensions.width as usize)
+        self.pixels.chunks_exact(self.dimensions.width as usize)
     }
 
     pub fn as_slice(&self) -> &[Colour] {
-        &self.array
+        &self.pixels
     }
 
     pub fn as_mut_slice(&mut self) -> &mut [Colour] {
-        &mut self.array
+        &mut self.pixels
     }
 
     pub fn as_u32_slice(&self) -> &[u32] {
-        unsafe { std::mem::transmute::<&[Colour], &[u32]>(&self.array) }
+        unsafe { std::mem::transmute::<&[Colour], &[u32]>(&self.pixels) }
     }
 }
 
@@ -81,11 +81,11 @@ impl HasDimensions<u32> for Buffer {
 
 impl std::ops::Index<usize> for Buffer {
     type Output = Colour;
-    fn index(&self, i: usize) -> &Colour { &self.array[i] }
+    fn index(&self, i: usize) -> &Colour { &self.pixels[i] }
 }
 
 impl std::ops::IndexMut<usize> for Buffer {
-    fn index_mut(&mut self, i: usize) -> &mut Colour { &mut self.array[i] }
+    fn index_mut(&mut self, i: usize) -> &mut Colour { &mut self.pixels[i] }
 }
 
 impl std::ops::Deref for Buffer {
@@ -107,7 +107,7 @@ impl<'a> IntoIterator for &'a Buffer {
     type IntoIter = std::slice::Iter<'a, Colour>;
 
     fn into_iter(self) -> Self::IntoIter {
-        self.array.iter()
+        self.pixels.iter()
     }
 }
 
@@ -116,6 +116,6 @@ impl<'a> IntoIterator for &'a mut Buffer {
     type IntoIter = std::slice::IterMut<'a, Colour>;
 
     fn into_iter(self) -> Self::IntoIter {
-        self.array.iter_mut()
+        self.pixels.iter_mut()
     }
 }