Restructure Rust project

bench/minify-html-bench/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["Wilson Lin <code@wilsonl.in>"]
 edition = "2018"
 
 [dependencies]
-minify-html = { path = "../.." }
+minify-html = { path = "../../rust/main" }
 structopt = "0.3.5"
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = "1.0.44"

cli/Cargo.toml

@@ -7,5 +7,5 @@ authors = ["Wilson Lin <code@wilsonl.in>"]
 edition = "2018"
 
 [dependencies]
-minify-html = { path = "..", features = ["js-esbuild"] }
+minify-html = { path = "../rust/main", features = ["js-esbuild"] }
 structopt = "0.3"

fuzz/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2018"
 
 [dependencies]
 afl = "0.10.0"
-minify-html = { path = ".." }
+minify-html = { path = "../rust/main" }

fuzz/process/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["Wilson Lin <code@wilsonl.in>"]
 edition = "2018"
 
 [dependencies]
-minify-html = { path = "../.." }
+minify-html = { path = "../../rust/main" }

gen/_common.ts

@@ -1,7 +1,7 @@
 import { mkdirSync, writeFileSync } from "fs";
 import { join } from "path";
 
-export const RUST_OUT_DIR = join(__dirname, "..", "src", "gen");
+export const RUST_OUT_DIR = join(__dirname, "..", "rust", "common", "src", "gen");
 
 try {
   mkdirSync(RUST_OUT_DIR);

java/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["Wilson Lin <code@wilsonl.in>"]
 edition = "2018"
 
 [dependencies]
-minify-html = { path = "..", features = ["js-esbuild"] }
+minify-html = { path = "../rust/main", features = ["js-esbuild"] }
 jni = "0.14.0"
 
 [lib]

nodejs/native/Cargo.toml

@@ -19,4 +19,4 @@ cbindgen = "0.14"
 
 [dependencies]
 libc = "0.2"
-minify-html = { path = "../..", optional = true }
+minify-html = { path = "../../rust/main", optional = true }

prebuild.sh

@@ -4,7 +4,7 @@ set -e
 
 pushd "$(dirname "$0")"
 
-# Generate crate::gen::* code.
+# Generate common::gen::* code.
 pushd gen
 npm i
 bash gen.sh

ruby/Cargo.toml

@@ -10,5 +10,5 @@ name = "minify_html_ruby_lib"
 crate-type = ["cdylib"]
 
 [dependencies]
-minify-html = { path = "..", features = ["js-esbuild"] }
+minify-html = { path = "../rust/main", features = ["js-esbuild"] }
 rutie = "0.7.0"

rust/common/.gitignore

@@ -1,3 +1,3 @@
 /Cargo.lock
-/target
 /src/gen/
+/target

rust/main/.gitignore

@@ -0,0 +1,2 @@
+/Cargo.lock
+/target

rust/onepass/.gitignore

@@ -0,0 +1,2 @@
+/Cargo.lock
+/target

version

@@ -101,6 +101,6 @@ cmd('cargo', 'generate-lockfile');
 cmd('git', 'add', '-A');
 cmd('git', 'commit', '-m', NEW_VERSION);
 cmd('git', 'tag', '-a', `v${NEW_VERSION}`, '-m', '');
-// We have generated but ignored in `src/gen`.
+// We have generated but ignored in `rust/common/gen`.
 cmd('cargo', 'publish', '--allow-dirty');
 cmd('git', 'push', '--follow-tags');