diff --git a/Cargo.lock b/Cargo.lock index 77d80c8..50cdf7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "getrandom", "once_cell", "version_check", @@ -121,12 +121,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -159,7 +153,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen", ] @@ -384,7 +378,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi", @@ -682,12 +676,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -741,7 +729,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -908,7 +896,6 @@ dependencies = [ "getrandom", "graph-rdfa-processor", "wasm-bindgen", - "wee_alloc", ] [[package]] @@ -1184,7 +1171,7 @@ version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "proc-macro2", "quote", "syn", @@ -1300,7 +1287,7 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "wasm-bindgen-macro", ] @@ -1348,40 +1335,6 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" -[[package]] -name = "wee_alloc" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "memory_units", - "winapi", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.52.0" diff --git a/Cargo.toml b/Cargo.toml index c59da63..8fe47c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,6 @@ ego-tree = "0.9.0" # some tests must run sequentially. # if library is broken, alternative is: cargo test -- --test-threads 1 graph-rdfa-processor = { version = "0.2.0", path='./lib-rdfa' } -wee_alloc = "0.4.5" console_error_panic_hook = "0.1.7" serial_test = "3.2.0" test-case = "3.3.1" diff --git a/lib-rdfa/examples/earl_html5/example0207.html b/lib-rdfa/examples/earl_html5/example0207.html index 75984fd..6fa76f4 100644 --- a/lib-rdfa/examples/earl_html5/example0207.html +++ b/lib-rdfa/examples/earl_html5/example0207.html @@ -1,15 +1,24 @@ - - -
-- Weekend off in Iona: - Oct 21st - to Oct 23rd. - See FreeTime.Example.org for - info on Iona, UK. -
- - \ No newline at end of file + + + ++ Weekend off in Iona: + Oct 21st + to + Oct 23rd. See + FreeTime.Example.org + for info on Iona, UK. +
+ + diff --git a/rdfa-wasm/Cargo.toml b/rdfa-wasm/Cargo.toml index 1aef8a0..4898d77 100644 --- a/rdfa-wasm/Cargo.toml +++ b/rdfa-wasm/Cargo.toml @@ -10,7 +10,7 @@ edition.workspace = true license.workspace = true [features] -default = ["wee_alloc", "console_error_panic_hook"] +default = ["console_error_panic_hook"] [lib] @@ -21,5 +21,4 @@ getrandom = { version = "0.2.10", features = ["js"] } graph-rdfa-processor.workspace = true [target.'cfg(target_arch = "wasm32")'.dependencies] wasm-bindgen.workspace = true -wee_alloc = { workspace = true, optional = true } console_error_panic_hook = { workspace = true, optional = true } diff --git a/rdfa-wasm/src/lib.rs b/rdfa-wasm/src/lib.rs index 6c39754..3c2e680 100644 --- a/rdfa-wasm/src/lib.rs +++ b/rdfa-wasm/src/lib.rs @@ -3,9 +3,6 @@ mod utils; use graph_rdfa_processor::RdfaGraph; use wasm_bindgen::prelude::*; -#[global_allocator] -static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT; - #[wasm_bindgen] pub fn html_to_rdfa(html: &str, base: &str, well_known_prefix: &str) -> String { utils::set_panic_hook();