summaryrefslogtreecommitdiff
path: root/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 21fabbd2..1cd948d7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,9 +43,9 @@ use std::future::Future;
use std::pin::Pin;
use crate::diagnostic::Diagnostic;
-use crate::eval::{State, Value};
+use crate::eval::State;
use crate::font::SharedFontLoader;
-use crate::layout::{Commands, MultiLayout};
+use crate::layout::BoxLayout;
use crate::syntax::{Decoration, Offset, Pos, SpanVec};
/// Process source code directly into a collection of layouts.
@@ -53,7 +53,7 @@ pub async fn typeset(
src: &str,
state: State,
loader: SharedFontLoader,
-) -> Pass<MultiLayout> {
+) -> Pass<Vec<BoxLayout>> {
let parsed = parse::parse(src);
let layouted = layout::layout(&parsed.output, state, loader).await;
let feedback = Feedback::merge(parsed.feedback, layouted.feedback);
@@ -93,13 +93,6 @@ impl<T> Pass<T> {
}
}
-impl Pass<Value> {
- /// Create a new pass with a list of layouting commands.
- pub fn commands(commands: Commands, feedback: Feedback) -> Self {
- Pass::new(Value::Commands(commands), feedback)
- }
-}
-
/// Diagnostic and semantic syntax highlighting data.
#[derive(Debug, Default, Clone, Eq, PartialEq)]
pub struct Feedback {