searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-05-17 17:53:57 +02:00
Code Issues Releases Wiki Activity

chore: Change the Box<Error> to be marked dyn

Browse Source
This commit is contained in:
Clément Renault 2019-08-22 14:28:27 +02:00 committed by Clément Renault
parent d8cd8c5def
commit 91b44a2759
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meilidb-schema/src/lib.rs
View File

@ -99,14 +99,14 @@ struct InnerSchema {
} }
impl Schema { impl Schema {
pub fn from_toml<R: Read>(mut reader: R) -> Result<Schema, Box<Error>> { pub fn from_toml<R: Read>(mut reader: R) -> Result<Schema, Box<dyn Error>> {
let mut buffer = Vec::new(); let mut buffer = Vec::new();
reader.read_to_end(&mut buffer)?; reader.read_to_end(&mut buffer)?;
let builder: SchemaBuilder = toml::from_slice(&buffer)?; let builder: SchemaBuilder = toml::from_slice(&buffer)?;
Ok(builder.build()) Ok(builder.build())
} }
pub fn to_toml<W: Write>(&self, mut writer: W) -> Result<(), Box<Error>> { pub fn to_toml<W: Write>(&self, mut writer: W) -> Result<(), Box<dyn Error>> {
let identifier = self.inner.identifier.clone(); let identifier = self.inner.identifier.clone();
let attributes = self.attributes_ordered(); let attributes = self.attributes_ordered();
let builder = SchemaBuilder { identifier, attributes }; let builder = SchemaBuilder { identifier, attributes };
@ -117,14 +117,14 @@ impl Schema {
Ok(()) Ok(())
} }
pub fn from_json<R: Read>(mut reader: R) -> Result<Schema, Box<Error>> { pub fn from_json<R: Read>(mut reader: R) -> Result<Schema, Box<dyn Error>> {
let mut buffer = Vec::new(); let mut buffer = Vec::new();
reader.read_to_end(&mut buffer)?; reader.read_to_end(&mut buffer)?;
let builder: SchemaBuilder = serde_json::from_slice(&buffer)?; let builder: SchemaBuilder = serde_json::from_slice(&buffer)?;
Ok(builder.build()) Ok(builder.build())
} }
pub fn to_json<W: Write>(&self, mut writer: W) -> Result<(), Box<Error>> { pub fn to_json<W: Write>(&self, mut writer: W) -> Result<(), Box<dyn Error>> {
let identifier = self.inner.identifier.clone(); let identifier = self.inner.identifier.clone();
let attributes = self.attributes_ordered(); let attributes = self.attributes_ordered();
let builder = SchemaBuilder { identifier, attributes }; let builder = SchemaBuilder { identifier, attributes };
@ -245,7 +245,7 @@ mod tests {
} }
#[test] #[test]
fn serialize_deserialize_toml() -> Result<(), Box<Error>> { fn serialize_deserialize_toml() -> Result<(), Box<dyn Error>> {
let mut builder = SchemaBuilder::with_identifier("id"); let mut builder = SchemaBuilder::with_identifier("id");
builder.new_attribute("alpha", DISPLAYED); builder.new_attribute("alpha", DISPLAYED);
builder.new_attribute("beta", DISPLAYED | INDEXED); builder.new_attribute("beta", DISPLAYED | INDEXED);
@ -278,7 +278,7 @@ mod tests {
} }
#[test] #[test]
fn serialize_deserialize_json() -> Result<(), Box<Error>> { fn serialize_deserialize_json() -> Result<(), Box<dyn Error>> {
let mut builder = SchemaBuilder::with_identifier("id"); let mut builder = SchemaBuilder::with_identifier("id");
builder.new_attribute("alpha", DISPLAYED); builder.new_attribute("alpha", DISPLAYED);
builder.new_attribute("beta", DISPLAYED | INDEXED); builder.new_attribute("beta", DISPLAYED | INDEXED);