summaryrefslogtreecommitdiff
path: root/tests/src
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2023-08-22 14:21:04 +0200
committerLaurenz <laurmaedje@gmail.com>2023-08-22 14:21:04 +0200
commitafc95ed19db8ded044d3b9b916fa0194cb882d0b (patch)
treeae9f5aa62398c1c81efe1f6d046fb2d631cb1c1c /tests/src
parent756bdb623c9deda1458506b1783a66d92f2d9414 (diff)
Virtual path type
Fixes #1937
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/tests.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/src/tests.rs b/tests/src/tests.rs
index 16292ef2..66c77900 100644
--- a/tests/src/tests.rs
+++ b/tests/src/tests.rs
@@ -25,8 +25,7 @@ use typst::doc::{Document, Frame, FrameItem, Meta};
use typst::eval::{eco_format, func, Bytes, Datetime, Library, NoneValue, Tracer, Value};
use typst::font::{Font, FontBook};
use typst::geom::{Abs, Color, RgbaColor, Smart};
-use typst::syntax::{FileId, Source, Span, SyntaxNode};
-use typst::util::PathExt;
+use typst::syntax::{FileId, Source, Span, SyntaxNode, VirtualPath};
use typst::World;
use typst_library::layout::{Margin, PageElem};
use typst_library::text::{TextElem, TextSize};
@@ -289,7 +288,7 @@ impl World for TestWorld {
impl TestWorld {
fn set(&mut self, path: &Path, text: String) -> Source {
- self.main = FileId::new(None, &Path::new("/").join(path));
+ self.main = FileId::new(None, VirtualPath::new(path));
let mut slot = self.slot(self.main).unwrap();
let source = Source::new(self.main, text);
slot.source = OnceCell::from(Ok(source.clone()));
@@ -302,7 +301,7 @@ impl TestWorld {
None => PathBuf::new(),
};
- let system_path = root.join_rooted(id.path()).ok_or(FileError::AccessDenied)?;
+ let system_path = id.vpath().resolve(&root).ok_or(FileError::AccessDenied)?;
Ok(RefMut::map(self.paths.borrow_mut(), |paths| {
paths.entry(system_path.clone()).or_insert_with(|| PathSlot {