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 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/bin')

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,
-- 
cgit v1.2.1