From dd4a4545a6b72e48cde5d2483fac5e4e76f6047f Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 12 Oct 2020 21:26:58 +0200
Subject: [PATCH] =?UTF-8?q?Move=20main=20back=20into=20src/=20=F0=9F=93=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.toml                            | 28 +++++++++++++--------------
 main/Cargo.toml                       | 10 ----------
 {main/src => src}/main.rs             |  0
 tests/{test_typeset.rs => typeset.rs} |  3 ++-
 4 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 main/Cargo.toml
 rename {main/src => src}/main.rs (100%)
 rename tests/{test_typeset.rs => typeset.rs} (98%)

diff --git a/Cargo.toml b/Cargo.toml
index 21c36b6d8..49833b262 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 65e61cfd2..000000000
--- 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
similarity index 100%
rename from main/src/main.rs
rename to src/main.rs
diff --git a/tests/test_typeset.rs b/tests/typeset.rs
similarity index 98%
rename from tests/test_typeset.rs
rename to tests/typeset.rs
index 8322dd085..8ba1ed470 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());