summaryrefslogtreecommitdiffstats
path: root/src/file/source
diff options
context:
space:
mode:
authorRyan Leckey <leckey.ryan@gmail.com>2018-07-02 15:33:38 -0700
committerRyan Leckey <leckey.ryan@gmail.com>2018-07-02 15:33:38 -0700
commitcbb9ef88ea6f6452614dd8bbffce7203b1358a55 (patch)
treefd4f67587f9a36c517a3a3f1ff7ef727697d5fef /src/file/source
parentbbc78d85610dec79aa4af4dd360131c7880efb5f (diff)
Run rustfmt (nightly)
Diffstat (limited to 'src/file/source')
-rw-r--r--src/file/source/file.rs25
-rw-r--r--src/file/source/mod.rs4
-rw-r--r--src/file/source/string.rs6
3 files changed, 18 insertions, 17 deletions
diff --git a/src/file/source/file.rs b/src/file/source/file.rs
index 80cd1dd..a413a1f 100644
--- a/src/file/source/file.rs
+++ b/src/file/source/file.rs
@@ -1,16 +1,16 @@
-use std::str::FromStr;
-use std::result;
use std::error::Error;
+use std::result;
+use std::str::FromStr;
-use std::path::{Path, PathBuf};
use file::format::ALL_EXTENSIONS;
-use std::io::{self, Read};
-use std::fs;
use std::env;
+use std::fs;
+use std::io::{self, Read};
use std::iter::Iterator;
+use std::path::{Path, PathBuf};
-use source::Source;
use super::{FileFormat, FileSource};
+use source::Source;
/// Describes a file sourced from a file
#[derive(Clone, Debug)]
@@ -35,12 +35,13 @@ impl FileSourceFile {
Some(format) => Ok((filename, format)),
None => {
for (format, extensions) in ALL_EXTENSIONS.iter() {
- if extensions.contains(&filename
- .extension()
- .unwrap_or_default()
- .to_string_lossy()
- .as_ref())
- {
+ if extensions.contains(
+ &filename
+ .extension()
+ .unwrap_or_default()
+ .to_string_lossy()
+ .as_ref(),
+ ) {
return Ok((filename, *format));
}
}
diff --git a/src/file/source/mod.rs b/src/file/source/mod.rs
index 4d9950f..5da69f1 100644
--- a/src/file/source/mod.rs
+++ b/src/file/source/mod.rs
@@ -1,11 +1,11 @@
pub mod file;
pub mod string;
-use std::fmt::Debug;
use std::error::Error;
+use std::fmt::Debug;
-use source::Source;
use super::FileFormat;
+use source::Source;
/// Describes where the file is sourced
pub trait FileSource: Debug + Clone {
diff --git a/src/file/source/string.rs b/src/file/source/string.rs
index 9c89231..a2f66cb 100644
--- a/src/file/source/string.rs
+++ b/src/file/source/string.rs
@@ -1,9 +1,9 @@
-use std::str::FromStr;
-use std::result;
use std::error::Error;
+use std::result;
+use std::str::FromStr;
-use source::Source;
use super::{FileFormat, FileSource};
+use source::Source;
/// Describes a file sourced from a string
#[derive(Clone, Debug)]