Remove the "cdylib" crate-type from all proc-blocks

.github/workflows/main.yml

@@ -27,14 +27,13 @@ jobs:
             ~/.cargo
             target/
             Cargo.lock
-          key: ${{ runner.os }}-cargo-${{ matrix.rust }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.rust }}
       - name: Setup Rust Toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-          target: wasm32-unknown-unknown
       - run: ls -la */*
       - name: Type Checking
         uses: actions-rs/cargo@v1
@@ -51,11 +50,39 @@ jobs:
         with:
           command: test
           args: --all --verbose
+
+  compile-to-wasm:
+    name: Compile to WebAssembly
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - nightly
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/cache@v1
+        with:
+          path: |
+            ~/.cargo
+            target/
+            Cargo.lock
+          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.rust }}
+      - name: Setup Rust Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          target: wasm32-unknown-unknown
       - name: Compile to WebAssembly
         uses: actions-rs/cargo@v1
         with:
           command: xtask
           args: dist --out-dir target/proc-blocks
+        env:
+          RUST_LOG: xtask=debug
       - name: Save Compiled proc-blocks
         uses: actions/upload-artifact@v2
         with:
@@ -74,7 +101,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
       - name: Invalidate Cloudfront
         run: aws cloudfront create-invalidation --distribution-id=${{ secrets.AWS_DISTRIBUTION_ID }} --paths="/proc-blocks/*"
-        if: github.ref == 'refs/heads/master' && matrix.rust == 'stable'
+        if: github.ref == 'refs/heads/master'
 
   api-docs:
     name: Publish API Docs to GitHub Pages

argmax/Cargo.toml

@@ -11,9 +11,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

audio_float_conversion/Cargo.toml

@@ -14,9 +14,6 @@ wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", op
 [dev-dependencies]
 pretty_assertions = "0.7.2"
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

binary_classification/Cargo.toml

@@ -11,9 +11,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

fft/Cargo.toml

@@ -22,9 +22,6 @@ wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", op
 [dev-dependencies]
 pretty_assertions = "0.7.2"
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

image-normalization/Cargo.toml

@@ -12,9 +12,6 @@ num-traits = { version = "0.2.14", default-features = false }
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

label/Cargo.toml

@@ -13,9 +13,6 @@ hotg-rune-proc-blocks = "^0.11.0"
 line-span = "0.1.3"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

modulo/Cargo.toml

@@ -13,9 +13,6 @@ num-traits = { version = "0.2.14", default-features = false }
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

most_confident_indices/Cargo.toml

@@ -11,9 +11,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

noise-filtering/Cargo.toml

@@ -13,9 +13,6 @@ libm = "0.2.1"
 paste = "1.0.5"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

normalize/Cargo.toml

@@ -12,9 +12,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

object_filter/Cargo.toml

@@ -12,9 +12,6 @@ hotg-rune-proc-blocks = "^0.11.0"
 libm = {version = "0.2.1", default-features = false}
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

parse/Cargo.toml

@@ -11,9 +11,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

segment_output/Cargo.toml

@@ -11,9 +11,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

softmax/Cargo.toml

@@ -12,9 +12,6 @@ hotg-rune-proc-blocks = "^0.11.0"
 libm = {version = "0.2.1", default-features = false}
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

text_extractor/Cargo.toml

@@ -11,9 +11,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

tokenizers/Cargo.toml

@@ -14,9 +14,6 @@ anyhow = { version = "1.0", default-features = false }
 unicode-normalization = {version = "0.1.19", default-features =false}
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

utf8_decode/Cargo.toml

@@ -11,9 +11,6 @@ repository = "/~https://github.com/hotg-ai/proc-blocks"
 hotg-rune-proc-blocks = "^0.11.0"
 wit-bindgen-rust = { git = "/~https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
-[lib]
-crate-type = ["rlib", "cdylib"]
-
 [features]
 default = []
 metadata = ["wit-bindgen-rust"]

xtask/src/build.rs

@@ -46,13 +46,11 @@ pub fn discover_proc_block_manifests(
     Ok(ProcBlocks {
         packages,
         target_dir: metadata.target_directory.into_std_path_buf(),
-        workspace_root: workspace_root.to_path_buf(),
     })
 }
 
 #[derive(Debug)]
 pub struct ProcBlocks {
-    workspace_root: PathBuf,
     packages: Vec<Package>,
     target_dir: PathBuf,
 }
@@ -70,48 +68,43 @@ impl ProcBlocks {
         let cargo =
             std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_string());
 
-        let mut cmd = Command::new(cargo);
-        cmd.arg("build")
-            .arg("--manifest-path")
-            .arg(&self.workspace_root)
-            .arg("--workspace")
-            .arg("--target=wasm32-unknown-unknown")
-            .arg("--exclude=xtask")
-            .arg("--features=metadata");
-
-        match mode {
-            CompilationMode::Release => {
-                cmd.arg("--release");
-            },
-            CompilationMode::Debug => {},
-        }
+        let mut libs = Vec::new();
+
+        for package in &self.packages {
+            let mut cmd = Command::new(&cargo);
+            cmd.arg("rustc")
+                .arg("--manifest-path")
+                .arg(&package.manifest_path)
+                .arg("--lib")
+                .arg("--target=wasm32-unknown-unknown")
+                .arg("--features=metadata")
+                .arg("-Zunstable-options")
+                .arg("--crate-type=cdylib");
+
+            match mode {
+                CompilationMode::Release => {
+                    cmd.arg("--release");
+                },
+                CompilationMode::Debug => {},
+            }
 
-        tracing::debug!(command = ?cmd, "Running cargo build");
+            tracing::debug!(command = ?cmd, "Running cargo build");
 
-        let status = cmd.status().with_context(|| {
-            format!(
-                "Unable to start \"{}\"",
-                cmd.get_program().to_string_lossy()
-            )
-        })?;
+            let status = cmd.status().with_context(|| {
+                format!(
+                    "Unable to start \"{}\"",
+                    cmd.get_program().to_string_lossy()
+                )
+            })?;
 
-        tracing::debug!(exit_code = ?status.code(), "Cargo build completed");
+            tracing::debug!(exit_code = ?status.code(), "Cargo build completed");
 
-        if !status.success() {
-            anyhow::bail!("Compilation failed");
-        }
+            if !status.success() {
+                anyhow::bail!("Compilation failed");
+            }
 
-        let libs: Vec<_> = self
-            .packages
-            .iter()
-            .filter(|pkg| pkg.features.contains_key("metadata"))
-            .filter_map(|pkg| {
-                pkg.targets
-                    .iter()
-                    .find(|t| t.kind.iter().any(|k| k == "cdylib"))
-                    .map(|t| &t.name)
-            })
-            .collect();
+            libs.push(&package.name);
+        }
 
         tracing::debug!(?libs);