diff options
author | Ryan Leckey <leckey.ryan@gmail.com> | 2017-06-23 09:55:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-23 09:55:16 -0700 |
commit | 21cf8d83cb840e5e8d1f7eb76b9cd1cf984c7444 (patch) | |
tree | cadd5bdf6f9aaa4397b9310f0de1e84782c6abc9 /src/file/format | |
parent | f4fad94a58c2eef5e1e49b4f2b150eac0efbd360 (diff) | |
parent | 6c1d3807560dd2d177096118f8cce03933511685 (diff) |
Merge pull request #37 from Jascha-N/boxed-error-send-sync
Make boxed errors Send + Sync
Diffstat (limited to 'src/file/format')
-rw-r--r-- | src/file/format/json.rs | 2 | ||||
-rw-r--r-- | src/file/format/mod.rs | 2 | ||||
-rw-r--r-- | src/file/format/toml.rs | 2 | ||||
-rw-r--r-- | src/file/format/yaml.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/file/format/json.rs b/src/file/format/json.rs index ed6c787..ead99f8 100644 --- a/src/file/format/json.rs +++ b/src/file/format/json.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::error::Error; use value::{Value, ValueKind}; -pub fn parse(uri: Option<&String>, text: &str) -> Result<HashMap<String, Value>, Box<Error>> { +pub fn parse(uri: Option<&String>, text: &str) -> Result<HashMap<String, Value>, Box<Error + Send + Sync>> { // Parse a JSON object value from the text // TODO: Have a proper error fire if the root of a file is ever not a Table let value = from_json_value(uri, &serde_json::from_str(text)?); diff --git a/src/file/format/mod.rs b/src/file/format/mod.rs index b3cf279..5aa1acb 100644 --- a/src/file/format/mod.rs +++ b/src/file/format/mod.rs @@ -66,7 +66,7 @@ impl FileFormat { pub fn parse(&self, uri: Option<&String>, text: &str) - -> Result<HashMap<String, Value>, Box<Error>> { + -> Result<HashMap<String, Value>, Box<Error + Send + Sync>> { match *self { #[cfg(feature = "toml")] FileFormat::Toml => toml::parse(uri, text), diff --git a/src/file/format/toml.rs b/src/file/format/toml.rs index cecad75..4307e48 100644 --- a/src/file/format/toml.rs +++ b/src/file/format/toml.rs @@ -4,7 +4,7 @@ use std::collections::{HashMap, BTreeMap}; use std::error::Error; use value::{Value, ValueKind}; -pub fn parse(uri: Option<&String>, text: &str) -> Result<HashMap<String, Value>, Box<Error>> { +pub fn parse(uri: Option<&String>, text: &str) -> Result<HashMap<String, Value>, Box<Error + Send + Sync>> { // Parse a TOML value from the provided text // TODO: Have a proper error fire if the root of a file is ever not a Table let value = from_toml_value(uri, &toml::from_str(text)?); diff --git a/src/file/format/yaml.rs b/src/file/format/yaml.rs index 4040ea6..3ed1356 100644 --- a/src/file/format/yaml.rs +++ b/src/file/format/yaml.rs @@ -6,7 +6,7 @@ use std::collections::{BTreeMap, HashMap}; use std::mem; use value::{Value, ValueKind}; -pub fn parse(uri: Option<&String>, text: &str) -> Result<HashMap<String, Value>, Box<Error>> { +pub fn parse(uri: Option<&String>, text: &str) -> Result<HashMap<String, Value>, Box<Error + Send + Sync>> { // Parse a YAML object from file let mut docs = yaml::YamlLoader::load_from_str(text)?; let root = match docs.len() { |