From d3b4d7da9a801dac3af6a3cf52eb55af83adc5f5 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 12 Jun 2023 16:43:49 +0200
Subject: More `bail!` usage

---
 src/model/introspect.rs | 4 ++--
 src/model/selector.rs   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/model')

diff --git a/src/model/introspect.rs b/src/model/introspect.rs
index b150fabf..42c1a9e1 100644
--- a/src/model/introspect.rs
+++ b/src/model/introspect.rs
@@ -9,7 +9,7 @@ use ecow::EcoVec;
 use indexmap::IndexMap;
 
 use super::{Content, Selector};
-use crate::diag::StrResult;
+use crate::diag::{bail, StrResult};
 use crate::doc::{Frame, FrameItem, Meta, Position};
 use crate::eval::{cast, Value};
 use crate::geom::{Point, Transform};
@@ -313,7 +313,7 @@ impl Introspector {
         let mut found = None;
         for elem in self.all().filter(|elem| elem.label() == Some(label)) {
             if found.is_some() {
-                return Err("label occurs multiple times in the document".into());
+                bail!("label occurs multiple times in the document");
             }
             found = Some(elem.clone());
         }
diff --git a/src/model/selector.rs b/src/model/selector.rs
index 5a2b11cb..9723ee4f 100644
--- a/src/model/selector.rs
+++ b/src/model/selector.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use ecow::{eco_format, EcoString, EcoVec};
 
 use super::{Content, ElemFunc, Label, Location};
-use crate::diag::StrResult;
+use crate::diag::{bail, StrResult};
 use crate::eval::{
     cast, CastInfo, Dict, FromValue, Func, IntoValue, Reflect, Regex, Value,
 };
@@ -201,8 +201,8 @@ impl FromValue for LocatableSelector {
                 }
                 Selector::Location(_) => {}
                 Selector::Label(_) => {}
-                Selector::Regex(_) => Err("text is not locatable")?,
-                Selector::Can(_) => Err("capability is not locatable")?,
+                Selector::Regex(_) => bail!("text is not locatable"),
+                Selector::Can(_) => bail!("capability is not locatable"),
                 Selector::Or(list) | Selector::And(list) => {
                     for selector in list {
                         validate(selector)?;
@@ -279,7 +279,7 @@ impl FromValue for ShowableSelector {
                 | Selector::Can(_)
                 | Selector::Before { .. }
                 | Selector::After { .. } => {
-                    Err("this selector cannot be used with show")?
+                    bail!("this selector cannot be used with show")
                 }
             }
             Ok(())
-- 
cgit v1.2.3