diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/graphics/image.rs | 9 | ||||
| -rw-r--r-- | src/library/prelude.rs | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/library/graphics/image.rs b/src/library/graphics/image.rs index 54793754..d11de9d1 100644 --- a/src/library/graphics/image.rs +++ b/src/library/graphics/image.rs @@ -1,4 +1,3 @@ -use crate::diag::Error; use crate::image::ImageId; use crate::library::prelude::*; use crate::library::text::TextNode; @@ -15,11 +14,9 @@ impl ImageNode { fn construct(ctx: &mut Context, args: &mut Args) -> TypResult<Content> { let path = args.expect::<Spanned<EcoString>>("path to image file")?; let full = ctx.resolve(&path.v); - let id = ctx.images.load(&full).map_err(|err| { - Error::boxed(path.span, match err.kind() { - std::io::ErrorKind::NotFound => "file not found".into(), - _ => format!("failed to load image ({})", err), - }) + let id = ctx.images.load(&full).map_err(|err| match err.kind() { + std::io::ErrorKind::NotFound => error!(path.span, "file not found"), + _ => error!(path.span, "failed to load image ({})", err), })?; let width = args.named("width")?; diff --git a/src/library/prelude.rs b/src/library/prelude.rs index 001798f3..39be5994 100644 --- a/src/library/prelude.rs +++ b/src/library/prelude.rs @@ -7,7 +7,7 @@ pub use std::sync::Arc; pub use typst_macros::node; -pub use crate::diag::{with_alternative, At, StrResult, TypResult}; +pub use crate::diag::{with_alternative, At, Error, StrResult, TypError, TypResult}; pub use crate::eval::{ Arg, Args, Array, Cast, Content, Dict, Func, Key, Layout, LayoutNode, Merge, Node, Regions, Scope, Show, ShowNode, Smart, StyleChain, StyleMap, StyleVec, Value, |