summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.toml28
-rw-r--r--main/Cargo.toml10
-rw-r--r--src/main.rs (renamed from main/src/main.rs)0
-rw-r--r--tests/typeset.rs (renamed from tests/test_typeset.rs)3
4 files changed, 15 insertions, 26 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 21c36b6d..49833b26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,18 +4,6 @@ version = "0.1.0"
authors = ["The Typst Project Developers"]
edition = "2018"
-[workspace]
-members = ["main"]
-
-[lib]
-bench = false
-
-[profile.dev.package."*"]
-opt-level = 2
-
-[profile.release]
-lto = true
-
[features]
default = ["fs"]
fs = ["fontdock/fs"]
@@ -31,17 +19,27 @@ serde = { version = "1", features = ["derive"], optional = true }
[dev-dependencies]
criterion = "0.3"
-kurbo = "0.6.3"
raqote = { version = "0.8", default-features = false }
+[profile.dev.package."*"]
+opt-level = 2
+
+[profile.release]
+lto = true
+
+[lib]
+bench = false
+
+[[bin]]
+name = "typstc"
+required-features = ["fs"]
+
[[test]]
name = "typeset"
-path = "tests/test_typeset.rs"
required-features = ["fs"]
harness = false
[[bench]]
name = "benchmarks"
-path = "benches/benchmarks.rs"
required-features = ["fs"]
harness = false
diff --git a/main/Cargo.toml b/main/Cargo.toml
deleted file mode 100644
index 65e61cfd..00000000
--- a/main/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "typstc-main"
-version = "0.1.0"
-authors = ["The Typst Project Developers"]
-edition = "2018"
-
-[dependencies]
-typstc = { path = ".." }
-fontdock = { path = "../../fontdock" }
-futures-executor = "0.3"
diff --git a/main/src/main.rs b/src/main.rs
index 9bf693e4..9bf693e4 100644
--- a/main/src/main.rs
+++ b/src/main.rs
diff --git a/tests/test_typeset.rs b/tests/typeset.rs
index 8322dd08..8ba1ed47 100644
--- a/tests/test_typeset.rs
+++ b/tests/typeset.rs
@@ -100,7 +100,8 @@ fn test(name: &str, src: &str, src_path: &Path, loader: &SharedFontLoader) {
let loader = loader.borrow();
let png_path = format!("{}/{}.png", OUT_DIR, name);
- render(&layouts, &loader, 3.0).write_png(png_path).unwrap();
+ let surface = render(&layouts, &loader, 3.0);
+ surface.write_png(png_path).unwrap();
let pdf_path = format!("{}/{}.pdf", OUT_DIR, name);
let file = BufWriter::new(File::create(pdf_path).unwrap());