Upgrade to toml 0.8

Author: djc

Cargo.toml

@@ -28,7 +28,7 @@ reductive = "0.9"
 serde = { version = "1", features = ["derive"] }
 smallvec = "1.7"
 thiserror = "1"
-toml = "0.5"
+toml = "0.8"
 
 [dependencies.memmap2]
 version = "0.9"

src/chunks/metadata.rs

@@ -5,7 +5,6 @@ use std::mem;
 use std::ops::{Deref, DerefMut};
 
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
-use toml::Value;
 
 use crate::chunks::io::{ChunkIdentifier, Header, ReadChunk, WriteChunk};
 use crate::error::{Error, Result};
@@ -16,18 +15,18 @@ use crate::io::ReadMetadata;
 /// finalfusion metadata in TOML format.
 #[derive(Clone, Debug, PartialEq)]
 pub struct Metadata {
-    inner: Value,
+    inner: toml::Table,
 }
 
 impl Metadata {
     /// Construct new `Metadata`.
-    pub fn new(data: Value) -> Self {
-        Metadata { inner: data }
+    pub fn new(inner: toml::Table) -> Self {
+        Metadata { inner }
     }
 }
 
 impl Deref for Metadata {
-    type Target = Value;
+    type Target = toml::Table;
 
     fn deref(&self) -> &Self::Target {
         &self.inner
@@ -40,9 +39,9 @@ impl DerefMut for Metadata {
     }
 }
 
-impl From<Value> for Metadata {
-    fn from(value: Value) -> Self {
-        Metadata { inner: value }
+impl From<toml::Table> for Metadata {
+    fn from(inner: toml::Table) -> Self {
+        Metadata { inner }
     }
 }
 
@@ -69,7 +68,7 @@ impl ReadChunk for Metadata {
 
         Ok(Metadata::new(
             buf_str
-                .parse::<Value>()
+                .parse::<toml::Table>()
                 .map_err(|e| Error::Format(format!("Cannot deserialize TOML metadata: {}", e)))
                 .map_err(Error::from)?,
         ))

src/compat/fasttext/io.rs

@@ -5,7 +5,6 @@ use std::ops::Mul;
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use ndarray::{s, Array2, ErrorKind as ShapeErrorKind, ShapeError};
 use serde::Serialize;
-use toml::Value;
 
 use crate::chunks::metadata::Metadata;
 use crate::chunks::norms::NdNorms;
@@ -107,7 +106,7 @@ impl ReadFastTextPrivate for Embeddings<FastTextSubwordVocab, NdArray> {
             )));
         }
 
-        let metadata = Value::try_from(config).map_err(|e| {
+        let metadata = toml::Table::try_from(config).map_err(|e| {
             Error::Format(format!("Cannot serialize model metadata to TOML: {}", e))
         })?;