summaryrefslogtreecommitdiff
path: root/src/encyclopedia.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-09-21 02:33:19 +0200
committertroido <troido@protonmail.com>2020-09-21 02:33:19 +0200
commit5ce9b012a7987f4085057f4f0b0af35e76810a7a (patch)
treea99418b5aec06d6be28e22150bce85d3c40b8ee7 /src/encyclopedia.rs
parentb6a4c7b2d383755402e5e2c6f60d9a75a899b809 (diff)
parent455867294cc849bff2c0829a7464e71e79a0dcae (diff)
Merge branch 'interact' into master
Diffstat (limited to 'src/encyclopedia.rs')
-rw-r--r--src/encyclopedia.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs
index e100cad..70f0ac6 100644
--- a/src/encyclopedia.rs
+++ b/src/encyclopedia.rs
@@ -94,7 +94,7 @@ impl Encyclopedia {
let mut assemblage = assemblages.get(&enttype).ok_or(perr!("template name '{:?}' does not point to not an assemblage", enttype))?.clone();
for arg in assemblage.arguments.iter_mut() {
if let Some(x) = values.get(&arg.0) {
- let param = Parameter::from_typed_json(arg.1, x).ok_or(perr!("subtitution parameter has wrong type"))?;
+ let param = Parameter::from_typed_json(arg.1, x)?;
arg.2 = Some(param);
}
}