From 90fe57e7b5b383195d6155578c00d10549ead0d3 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Wed, 14 Oct 2020 09:00:22 +0300
Subject: refactor: rename Chunk to DataChunk

---
 src/bin/obnam-backup.rs | 8 ++++----
 src/bin/obnam-server.rs | 6 +++---
 src/chunk.rs            | 6 +++---
 src/server.rs           | 6 +++---
 src/store.rs            | 8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/bin/obnam-backup.rs b/src/bin/obnam-backup.rs
index 7f761bc..d2de289 100644
--- a/src/bin/obnam-backup.rs
+++ b/src/bin/obnam-backup.rs
@@ -1,7 +1,7 @@
 // Read stdin, split into chunks, upload new chunks to chunk server.
 
 use indicatif::{ProgressBar, ProgressStyle};
-use obnam::chunk::Chunk;
+use obnam::chunk::DataChunk;
 use obnam::chunkmeta::ChunkMeta;
 use serde::Deserialize;
 use sha2::{Digest, Sha256};
@@ -75,7 +75,7 @@ impl Config {
     }
 }
 
-fn read_chunk<H>(handle: &mut H) -> anyhow::Result<Option<(ChunkMeta, Chunk)>>
+fn read_chunk<H>(handle: &mut H) -> anyhow::Result<Option<(ChunkMeta, DataChunk)>>
 where
     H: Read + BufRead,
 {
@@ -101,7 +101,7 @@ where
     let hash = format!("{:x}", hash);
     let meta = ChunkMeta::new(&hash);
 
-    let chunk = Chunk::new(buffer.to_vec());
+    let chunk = DataChunk::new(buffer.to_vec());
     Ok(Some((meta, chunk)))
 }
 
@@ -109,7 +109,7 @@ fn upload_chunk(
     client: &reqwest::blocking::Client,
     config: &Config,
     meta: ChunkMeta,
-    chunk: Chunk,
+    chunk: DataChunk,
 ) -> anyhow::Result<()> {
     let url = format!(
         "http://{}:{}/chunks",
diff --git a/src/bin/obnam-server.rs b/src/bin/obnam-server.rs
index 7d37383..cc21855 100644
--- a/src/bin/obnam-server.rs
+++ b/src/bin/obnam-server.rs
@@ -1,6 +1,6 @@
 use bytes::Bytes;
 use log::{debug, error, info};
-use obnam::{chunk::Chunk, chunkid::ChunkId, chunkmeta::ChunkMeta, index::Index, store::Store};
+use obnam::{chunk::DataChunk, chunkid::ChunkId, chunkmeta::ChunkMeta, index::Index, store::Store};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::default::Default;
@@ -140,7 +140,7 @@ pub async fn create_chunk(
         }
     };
 
-    let chunk = Chunk::new(data.to_vec());
+    let chunk = DataChunk::new(data.to_vec());
 
     match store.save(&id, &meta, &chunk) {
         Ok(_) => (),
@@ -280,7 +280,7 @@ pub async fn delete_chunk(
 
 enum ChunkResult {
     Created(ChunkId),
-    Fetched(ChunkMeta, Chunk),
+    Fetched(ChunkMeta, DataChunk),
     Found(SearchHits),
     Deleted,
     NotFound,
diff --git a/src/chunk.rs b/src/chunk.rs
index f3a7b79..17159e0 100644
--- a/src/chunk.rs
+++ b/src/chunk.rs
@@ -7,14 +7,14 @@ use serde::Serialize;
 /// A chunk also contains its associated metadata, except its
 /// identifier.
 #[derive(Debug, Serialize)]
-pub struct Chunk {
+pub struct DataChunk {
     data: Vec<u8>,
 }
 
-impl Chunk {
+impl DataChunk {
     /// Construct a new chunk.
     pub fn new(data: Vec<u8>) -> Self {
-        Chunk { data }
+        Self { data }
     }
 
     /// Return a chunk's data.
diff --git a/src/server.rs b/src/server.rs
index 8d1eed0..4d5880e 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,4 +1,4 @@
-use crate::chunk::Chunk;
+use crate::chunk::DataChunk;
 use crate::chunkid::ChunkId;
 use crate::chunkmeta::ChunkMeta;
 use serde::{Deserialize, Serialize};
@@ -26,11 +26,11 @@ impl Created {
 #[derive(Debug, Serialize)]
 pub struct Fetched {
     id: ChunkId,
-    chunk: Chunk,
+    chunk: DataChunk,
 }
 
 impl Fetched {
-    pub fn new(id: ChunkId, chunk: Chunk) -> Self {
+    pub fn new(id: ChunkId, chunk: DataChunk) -> Self {
         Fetched { id, chunk }
     }
 
diff --git a/src/store.rs b/src/store.rs
index bad52ce..8d50b2f 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -1,4 +1,4 @@
-use crate::chunk::Chunk;
+use crate::chunk::DataChunk;
 use crate::chunkid::ChunkId;
 use crate::chunkmeta::ChunkMeta;
 use std::path::{Path, PathBuf};
@@ -26,7 +26,7 @@ impl Store {
     }
 
     /// Save a chunk into a store.
-    pub fn save(&self, id: &ChunkId, meta: &ChunkMeta, chunk: &Chunk) -> anyhow::Result<()> {
+    pub fn save(&self, id: &ChunkId, meta: &ChunkMeta, chunk: &DataChunk) -> anyhow::Result<()> {
         std::fs::write(&self.filename(id, "meta"), meta.to_json())?;
         std::fs::write(&self.filename(id, "data"), chunk.data())?;
         Ok(())
@@ -39,10 +39,10 @@ impl Store {
     }
 
     /// Load a chunk from a store.
-    pub fn load(&self, id: &ChunkId) -> anyhow::Result<(ChunkMeta, Chunk)> {
+    pub fn load(&self, id: &ChunkId) -> anyhow::Result<(ChunkMeta, DataChunk)> {
         let meta = self.load_meta(id)?;
         let data = std::fs::read(&self.filename(id, "data"))?;
-        Ok((meta, Chunk::new(data)))
+        Ok((meta, DataChunk::new(data)))
     }
 
     /// Delete a chunk from a store.
-- 
cgit v1.2.1