diff --git a/Cargo.lock b/Cargo.lock index e417f3c..b7ca5f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,7 +178,6 @@ dependencies = [ name = "reconcile-text" version = "0.4.10" dependencies = [ - "cfg-if 1.0.1", "console_error_panic_hook", "insta", "pretty_assertions", diff --git a/Cargo.toml b/Cargo.toml index 8e3bd6c..28a5eb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,12 +32,11 @@ wasm-bindgen = { version = "0.2.99", optional = true } console_error_panic_hook = { version = "0.1.7", optional = true } wee_alloc = { version = "0.4.2", optional = true } -cfg-if = "1.0.1" [features] default = [] serde = [ "dep:serde" ] -wasm = [ "dep:wasm-bindgen" ] +wasm = [ "dep:wasm-bindgen", "dep:wee_alloc" ] console_error_panic_hook = [ "dep:console_error_panic_hook" ] [dev-dependencies] diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index fc3eac7..0ab7b7e 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -25,7 +25,7 @@ fi echo "Bumping versions" cargo set-version --bump $1 -wasm-pack build --target web --features wasm,wee_alloc +wasm-pack build --target web --features wasm cd reconcile-js npm version $1 diff --git a/scripts/dev-website.sh b/scripts/dev-website.sh index 9f88272..572bdf4 100755 --- a/scripts/dev-website.sh +++ b/scripts/dev-website.sh @@ -2,7 +2,7 @@ set -e -wasm-pack build --target web --features wasm,wee_alloc +wasm-pack build --target web --features wasm cd reconcile-js npm run build cd ../examples/website diff --git a/src/wasm.rs b/src/wasm.rs index 0eda809..8cf080a 100644 --- a/src/wasm.rs +++ b/src/wasm.rs @@ -1,16 +1,12 @@ //! Expose the `reconcile` crate's functionality to WebAssembly. use core::str; -use cfg_if::cfg_if; use wasm_bindgen::prelude::*; use crate::{BuiltinTokenizer, CursorPosition, SpanWithHistory, TextWithCursors}; -cfg_if! { - if #[cfg(feature = "wee_alloc")] { - #[global_allocator] - static ALLOC: wee_alloc::WeeAlloc<'_> = wee_alloc::WeeAlloc::INIT; - } -} + +#[global_allocator] +static ALLOC: wee_alloc::WeeAlloc<'_> = wee_alloc::WeeAlloc::INIT; /// WASM wrapper around `crate::reconcile` for merging text. #[wasm_bindgen(js_name = reconcile)]