-
Notifications
You must be signed in to change notification settings - Fork 825
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove cranelift from sys-default feature #3004
Conversation
499fca6
to
9b5bcda
Compare
1c32873
to
eb12cef
Compare
4a86f5d
to
a43803f
Compare
a43803f
to
7303b82
Compare
lib/wasi/Cargo.toml
Outdated
compiler-singlepass = ["wasmer/default-singlepass"] | ||
compiler-cranelift = ["wasmer/default-cranelift"] | ||
compiler-llvm = ["wasmer/default-llvm"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need this.
Makefile
Outdated
@@ -486,10 +486,10 @@ test-packages: | |||
test-js: test-js-api test-js-wasi | |||
|
|||
test-js-api: | |||
cd lib/api && wasm-pack test --node -- --no-default-features --features js-default,wat | |||
cd lib/api && wasm-pack test --node -- --no-default-features --features js-default,wat,default-compiler |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No compiler shall be included here I believe
Makefile
Outdated
|
||
test-js-wasi: | ||
cd lib/wasi && wasm-pack test --node -- --no-default-features --features test-js | ||
cd lib/wasi && wasm-pack test --node -- --no-default-features --features test-js,default-compiler |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No compiler shall be included here I believe
lib/wasi/Cargo.toml
Outdated
@@ -46,12 +46,16 @@ wasm-bindgen-test = "0.3.0" | |||
tracing-wasm = "0.2" | |||
|
|||
[features] | |||
default = ["sys-default"] | |||
default = ["wasmer/sys", "wasmer/wat", "wasmer/default-engine", "sys", "logging", "host-fs", "sys-poll", "host-vnet"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those are parts already of sys-default. It's way better to keep using those
tests/lib/wast/Cargo.toml
Outdated
wasmer = { path = "../../../lib/api", version = "=2.3.0", default-features = false, features = ["experimental-reference-types-extern-ref"] } | ||
wasmer-wasi = { path = "../../../lib/wasi", version = "=2.3.0" } | ||
wasmer-wasi = { path = "../../../lib/wasi", version = "=2.3.0", features = ["compiler-cranelift"] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can just have:
wasmer = { path = "../../../lib/api", version = "=2.3.0", default-features = false, features = ["experimental-reference-types-extern-ref"] } | |
wasmer-wasi = { path = "../../../lib/wasi", version = "=2.3.0" } | |
wasmer-wasi = { path = "../../../lib/wasi", version = "=2.3.0", features = ["compiler-cranelift"] } | |
wasmer = { path = "../../../lib/api", version = "=2.3.0", default-features = false, features = ["experimental-reference-types-extern-ref", "cranelift"] } | |
wasmer-wasi = { path = "../../../lib/wasi", version = "=2.3.0" } |
When using the Wasmer-WASI crate, the sys-default feature from wasmer is depending upon, which causes the following to conflict: [dependencies.wasmer] version = "2.0" default-features=false features=["sys" , "compiler-singlepass", "engine-universal"] [dependencies.wasmer-wasi] version = "2.0" Because wasmer-wasi "2.0" depends on wasmer with the default features, which implies using cranelift, which conflicts with singlepass. Fixes #2882
7303b82
to
49551d6
Compare
When using the Wasmer-WASI crate, the sys-default feature from wasmer is depending upon, which causes the following to conflict:
Because wasmer-wasi "2.0" depends on wasmer with the default features, which implies using cranelift, which conflicts with singlepass.
Fixes #2882
Review