Use SpiderMonkey's encoding_c instead of our own crate (#55)

SpiderMonkey uses the `encoding_c` Rust crate and comes bundled with it. This lead to either duplication or linking errors when using our own crate re-exporting `encoding_c`. Instead, with this PR we just bundle a C header file for interacting with the crate's functionality, and rely on SpiderMonkey's version.
bytecodealliance · May 29, 2024 · aa9ff14 · aa9ff14
1 parent 8fcd257
commit aa9ff14
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 111 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,7 @@ include("host_api")
 include("build-crates")
 
 add_library(extension_api INTERFACE include/extension-api.h runtime/encode.h)
-target_link_libraries(extension_api INTERFACE rust-url rust-encoding spidermonkey)
+target_link_libraries(extension_api INTERFACE rust-url spidermonkey)
 target_include_directories(extension_api INTERFACE include deps/include runtime)
 
 include("builtins")

diff --git a/cmake/build-crates.cmake b/cmake/build-crates.cmake
@@ -1,5 +1,2 @@
 corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-url/Cargo.toml NO_LINKER_OVERRIDE)
 set_property(TARGET rust-url PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-url/)
-
-corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-encoding/Cargo.toml NO_LINKER_OVERRIDE)
-set_property(TARGET rust-encoding PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-encoding/)
diff --git a/crates/rust-encoding/.gitignore b/crates/rust-encoding/.gitignore
diff --git a/crates/rust-encoding/Cargo.lock b/crates/rust-encoding/Cargo.lock
diff --git a/crates/rust-encoding/Cargo.toml b/crates/rust-encoding/Cargo.toml
diff --git a/crates/rust-encoding/cbindgen.toml b/crates/rust-encoding/cbindgen.toml
diff --git a/crates/rust-encoding/src/lib.rs b/crates/rust-encoding/src/lib.rs
diff --git a/crates/rust-encoding/rust-encoding.h → deps/include/rust-encoding.h b/crates/rust-encoding/rust-encoding.h → deps/include/rust-encoding.h
@@ -1,3 +1,6 @@
+// NOTE: This file was generated by cbindgen for the encoding_c crate.
+// Since that crate is included in SpiderMonkey, we just include the header file here.
+// TODO: look into whether we can bundle the header file with SpiderMonkey's includes.
 // The constructor created by cbindgen's `derive_constructor` causes this warning.
 // Gecko's various uses of cbindgen silence it, so we do, too.
 #ifdef __clang__