summaryrefslogtreecommitdiffstats
path: root/src/config/file.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/config/file.rs')
-rw-r--r--src/config/file.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/config/file.rs b/src/config/file.rs
index 50b3d48..b30d147 100644
--- a/src/config/file.rs
+++ b/src/config/file.rs
@@ -16,7 +16,7 @@ use serde_json::{Map as JsonMap, Value as JsonValue};
use tracing::debug;
use super::import;
-use super::{Entry, Layer, Origin, Overlay, Provenance, overlay, spec, unset_entry};
+use super::{Entry, Layer, Overlay, Provenance, overlay, spec, unset_entry};
const INCLUDE: &str = "include";
const INCLUDE_OPTIONAL: &str = "include-optional";
@@ -80,14 +80,14 @@ fn load_inner(path: &Path, loading: &mut Vec<PathBuf>) -> Result<Layer> {
for (name, value) in own {
let spec = spec(&name)
.ok_or_else(|| anyhow!("unknown option {name:?} in {}", canonical.display()))?;
- let (value, imports) = super::resolve_file_value(spec, value, &dir)
+ let (value, sources) = super::resolve_file_value(spec, value, &dir)
.with_context(|| format!("option {name} in {}", canonical.display()))?;
let entry = Entry {
- origin: Origin {
- provenance: Provenance::File(canonical.clone()),
- unset: value.is_null(),
- imports,
- },
+ origin: sources.origin(
+ Provenance::File(canonical.clone()),
+ value.is_null(),
+ spec.kind,
+ ),
value,
};
overlay(&mut layer, name, entry, Overlay::FileOverFile);