From d11f18e5f0d3b96c882f548d0bcefcc689ef0827 Mon Sep 17 00:00:00 2001 From: Lukas Kalbertodt Date: Sun, 16 May 2021 16:07:36 +0200 Subject: [PATCH] Move `File` and `FileFormat` to the crate root The crate root is not super busy yet, so it's more convenient to have no public sub modules. --- src/{source.rs => file.rs} | 4 ---- src/lib.rs | 15 ++++++--------- 2 files changed, 6 insertions(+), 13 deletions(-) rename src/{source.rs => file.rs} (97%) diff --git a/src/source.rs b/src/file.rs similarity index 97% rename from src/source.rs rename to src/file.rs index db6f6ab..524c03b 100644 --- a/src/source.rs +++ b/src/file.rs @@ -1,12 +1,8 @@ -//! Types implementing [`Source`], thus representing some source of -//! configuration values. - use std::{ffi::OsStr, fs, io, path::{Path, PathBuf}}; use crate::{Config, Error, ErrorInner, Partial, Source}; - impl Source for &Path { fn load(&self) -> Result { let ext = self.extension().ok_or_else(|| { diff --git a/src/lib.rs b/src/lib.rs index 19340aa..fa39e34 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,18 +2,15 @@ use std::{ffi::OsString, fmt, path::PathBuf}; use serde::Deserialize; - -pub use serde; -pub use confique_macro::Config; - - -// #[cfg(feature = "doc-example")] -// pub mod example; - #[doc(hidden)] pub mod internal; -pub mod source; +mod file; + + +pub use serde; +pub use confique_macro::Config; +pub use self::file::{File, FileFormat}; /// A configuration object that can be deserialized in layers via `serde`.