From 14d28dbf4e9c67333c54aed51c0a1dab9a264c17 Mon Sep 17 00:00:00 2001 From: frozolotl <44589151+frozolotl@users.noreply.github.com> Date: Tue, 12 Sep 2023 19:26:35 +1000 Subject: [PATCH] Gracefully handle error if field was not defined (#2110) --- crates/typst-cli/src/query.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/typst-cli/src/query.rs b/crates/typst-cli/src/query.rs index 55f04fe80..0db6eb540 100644 --- a/crates/typst-cli/src/query.rs +++ b/crates/typst-cli/src/query.rs @@ -83,7 +83,7 @@ fn retrieve( /// Format the query result in the output format. fn format(elements: Vec, command: &QueryCommand) -> StrResult { if command.one && elements.len() != 1 { - bail!("expected exactly one element, found {}", elements.len()) + bail!("expected exactly one element, found {}", elements.len()); } let mapped: Vec<_> = elements @@ -95,7 +95,10 @@ fn format(elements: Vec, command: &QueryCommand) -> StrResult { .collect(); if command.one { - serialize(&mapped[0], command.format) + let Some(value) = mapped.get(0) else { + bail!("no such field found for element"); + }; + serialize(value, command.format) } else { serialize(&mapped, command.format) }