Adapt to new jbk SmallVec

libwaj/src/create/entry_store_creator.rs

@@ -67,7 +67,7 @@ impl EntryStoreCreator {
         //println!("{:?}", entry.name());
         let entry = match entry_kind {
             EntryKind::Content(content_address, mimetype) => {
-                let mime_id = self.mime_store.add_value(mimetype.to_string().into());
+                let mime_id = self.mime_store.add_value(mimetype.as_ref().as_bytes());
                 Entry::new_content(path, mime_id, content_address)
             }
             EntryKind::Redirect(target) => {

libwaj/src/entry.rs

@@ -4,22 +4,22 @@ use jbk::reader::ByteSlice;
 
 pub struct CommonPart {
     idx: jbk::EntryIdx,
-    path: Vec<u8>,
+    path: jbk::SmallBytes,
 }
 
 pub trait CommonEntry {
     fn common(&self) -> &CommonPart;
     fn idx(&self) -> jbk::EntryIdx {
         self.common().idx
     }
-    fn path(&self) -> &Vec<u8> {
+    fn path(&self) -> &[u8] {
         &self.common().path
     }
 }
 
 pub struct Content {
     common: CommonPart,
-    mimetype: Vec<u8>,
+    mimetype: jbk::SmallBytes,
     content: jbk::ContentAddress,
 }
 
@@ -34,14 +34,14 @@ impl Content {
         self.content
     }
 
-    pub fn mimetype(&self) -> &Vec<u8> {
+    pub fn mimetype(&self) -> &[u8] {
         &self.mimetype
     }
 }
 
 pub struct Redirect {
     common: CommonPart,
-    target: Vec<u8>,
+    target: jbk::SmallBytes,
 }
 
 impl CommonEntry for Redirect {
@@ -51,7 +51,7 @@ impl CommonEntry for Redirect {
 }
 
 impl Redirect {
-    pub fn target(&self) -> &Vec<u8> {
+    pub fn target(&self) -> &[u8] {
         &self.target
     }
 }
@@ -71,7 +71,7 @@ mod private {
 
         fn create_entry(&self, idx: jbk::EntryIdx, reader: &ByteSlice) -> jbk::Result<CommonPart> {
             let path_prop = self.path_property.create(reader)?;
-            let mut path = vec![];
+            let mut path = jbk::SmallBytes::new();
             path_prop.resolve_to_vec(&mut path)?;
             Ok(CommonPart { idx, path })
         }
@@ -96,7 +96,7 @@ mod private {
 
         fn create_entry(&self, idx: jbk::EntryIdx, reader: &ByteSlice) -> jbk::Result<Self::Entry> {
             let mimetype_prop = self.mimetype_property.create(reader)?;
-            let mut mimetype = vec![];
+            let mut mimetype = jbk::SmallBytes::new();
             mimetype_prop.resolve_to_vec(&mut mimetype)?;
             Ok(Content {
                 common: self.common.create_entry(idx, reader)?,
@@ -124,7 +124,7 @@ mod private {
         fn create_entry(&self, idx: jbk::EntryIdx, reader: &ByteSlice) -> jbk::Result<Self::Entry> {
             let common = self.common.create_entry(idx, reader)?;
             let target_prop = self.link_property.create(reader)?;
-            let mut target = vec![];
+            let mut target = jbk::SmallBytes::new();
             target_prop.resolve_to_vec(&mut target)?;
             Ok(Redirect { common, target })
         }

libwaj/src/serve.rs

@@ -34,7 +34,7 @@ fn url_variants(url: &str) -> Vec<Cow<str>> {
 
 struct ContentEntry {
     pub content_address: jbk::reader::ContentAddress,
-    pub mimetype: Vec<u8>,
+    pub mimetype: jbk::SmallBytes,
 }
 
 struct ContentBuilder {
@@ -70,7 +70,7 @@ struct RedirectBuilder {
 }
 
 impl Builder for RedirectBuilder {
-    type Entry = Vec<u8>;
+    type Entry = jbk::SmallBytes;
 
     fn new(properties: &AllProperties) -> Self {
         Self {
@@ -80,7 +80,7 @@ impl Builder for RedirectBuilder {
 
     fn create_entry(&self, _idx: jbk::EntryIdx, reader: &ByteSlice) -> jbk::Result<Self::Entry> {
         let target_prop = self.target_property.create(reader)?;
-        let mut target = vec![];
+        let mut target = jbk::SmallBytes::new();
         target_prop.resolve_to_vec(&mut target)?;
         Ok(target)
     }

libwaj/src/waj.rs

@@ -33,7 +33,7 @@ struct PathBuilder {
 }
 
 impl Builder for PathBuilder {
-    type Entry = Vec<u8>;
+    type Entry = jbk::SmallBytes;
 
     fn new(properties: &AllProperties) -> Self {
         Self {
@@ -43,7 +43,7 @@ impl Builder for PathBuilder {
 
     fn create_entry(&self, _idx: jbk::EntryIdx, reader: &ByteSlice) -> jbk::Result<Self::Entry> {
         let path_prop = self.path_property.create(reader)?;
-        let mut path = vec![];
+        let mut path = jbk::SmallBytes::new();
         path_prop.resolve_to_vec(&mut path)?;
         Ok(path)
     }