Make File generic over Format and FileExtensions

1 files changed, 32 insertions, 16 deletions

diff --git a/src/file/mod.rs b/src/file/mod.rs
index 2b15a1a..8d5b538 100644
--- a/src/file/mod.rs
+++ b/src/file/mod.rs
@@ -1,36 +1,43 @@
+pub mod extension;
 mod format;
 pub mod source;
-pub mod extension;
 
+use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 
 use crate::error::*;
 use crate::map::Map;
 use crate::source::Source;
 use crate::value::Value;
+use crate::Format;
 
 pub use self::format::FileFormat;
 use self::source::FileSource;
 
+pub use self::extension::FileExtensions;
 pub use self::source::file::FileSourceFile;
 pub use self::source::string::FileSourceString;
 
 #[derive(Clone, Debug)]
-pub struct File<T>
+pub struct File<T, F>
 where
-    T: FileSource,
+    F: Format + FileExtensions,
+    T: FileSource<F>,
 {
     source: T,
 
     /// Format of file (which dictates what driver to use).
-    format: Option<FileFormat>,
+    format: Option<F>,
 
     /// A required File will error if it cannot be found
     required: bool,
 }
 
-impl File<source::string::FileSourceString> {
-    pub fn from_str(s: &str, format: FileFormat) -> Self {
+impl<F> File<source::string::FileSourceString, F>
+where
+    F: Format + FileExtensions + 'static,
+{
+    pub fn from_str(s: &str, format: F) -> Self {
         File {
             format: Some(format),
             required: true,
@@ -39,15 +46,20 @@ impl File<source::string::FileSourceString> {
     }
 }
 
-impl File<source::file::FileSourceFile> {
-    pub fn new(name: &str, format: FileFormat) -> Self {
+impl<F> File<source::file::FileSourceFile, F>
+where
+    F: Format + FileExtensions + 'static,
+{
+    pub fn new(name: &str, format: F) -> Self {
         File {
             format: Some(format),
             required: true,
             source: source::file::FileSourceFile::new(name.into()),
         }
     }
+}
 
+impl File<source::file::FileSourceFile, FileFormat> {
     /// Given the basename of a file, will attempt to locate a file by setting its
     /// extension to a registered format.
     pub fn with_name(name: &str) -> Self {
@@ -59,7 +71,7 @@ impl File<source::file::FileSourceFile> {
     }
 }
 
-impl<'a> From<&'a Path> for File<source::file::FileSourceFile> {
+impl<'a> From<&'a Path> for File<source::file::FileSourceFile, FileFormat> {
     fn from(path: &'a Path) -> Self {
         File {
             format: None,
@@ -69,7 +81,7 @@ impl<'a> From<&'a Path> for File<source::file::FileSourceFile> {
     }
 }
 
-impl From<PathBuf> for File<source::file::FileSourceFile> {
+impl From<PathBuf> for File<source::file::FileSourceFile, FileFormat> {
     fn from(path: PathBuf) -> Self {
         File {
             format: None,
@@ -79,8 +91,12 @@ impl From<PathBuf> for File<source::file::FileSourceFile> {
     }
 }
 
-impl<T: FileSource> File<T> {
-    pub fn format(mut self, format: FileFormat) -> Self {
+impl<T, F> File<T, F>
+where
+    F: Format + FileExtensions + 'static,
+    T: FileSource<F>,
+{
+    pub fn format(mut self, format: F) -> Self {
         self.format = Some(format);
         self
     }
@@ -91,10 +107,10 @@ impl<T: FileSource> File<T> {
     }
 }
 
-impl<T: FileSource> Source for File<T>
+impl<T, F> Source for File<T, F>
 where
-    T: 'static,
-    T: Sync + Send,
+    F: Format + FileExtensions + Debug + Clone + Send + Sync + 'static,
+    T: Sync + Send + FileSource<F> + 'static,
 {
     fn clone_into_box(&self) -> Box<dyn Source + Send + Sync> {
         Box::new((*self).clone())
@@ -104,7 +120,7 @@ where
         // Coerce the file contents to a string
         let (uri, contents, format) = match self
             .source
-            .resolve(self.format)
+            .resolve(self.format.clone())
             .map_err(|err| ConfigError::Foreign(err))
         {
             Ok((uri, contents, format)) => (uri, contents, format),