T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove usage of CompilationStrategy from Config (#764)

Browse Source 
* Remove usage of `CompilationStrategy` from `Config`

This commit removes the public API usage of the internal
`CompilationStrategy` enumeration from the `Config` type in the
`wasmtime` crate. To do this the `enum` was copied locally into the
crate and renamed `Strategy`. The high-level description of this change
is:

* The `Config::strategy` method now takes a locally-defined `Strategy`
  enumeration instead of an internal type.

* The contents of `Strategy` are always the same, not relying on Cargo
  features to indicate which variants are present. This avoids
  unnecessary downstream `#[cfg]`.

* A `lightbeam` feature was added to the `wasmtime` crate itself to
  lightbeam compilation support.

* The `Config::strategy` method is now fallible. It returns a runtime
  error if support for the selected strategy wasn't compiled in.

* The `Strategy` enum is listed as `#[non_exhaustive]` so we can safely
  add variants over time to it.

This reduces the public crate dependencies of the `wasmtime` crate
itself, removing the need to reach into internal crates even more!

cc #708

* Fix fuzz targets

* Update nightly used to build releases

* Run rustfmt
This commit is contained in:
Alex Crichton
2020-01-06 18:08:13 -06:00
committed by GitHub
parent 787f50e107
commit 7474633cca
24 changed files with 173 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib.rs
View File

@@ -1,16 +1,13 @@
use wasmtime_jit::CompilationStrategy;
use anyhow::{bail, Result};
use wasmtime::Strategy;
pub fn pick_compilation_strategy(cranelift: bool, lightbeam: bool) -> CompilationStrategy {
// Decide how to compile.
match (lightbeam, cranelift) {
#[cfg(feature = "lightbeam")]
(true, false) => CompilationStrategy::Lightbeam,
#[cfg(not(feature = "lightbeam"))]
(true, false) => panic!("--lightbeam given, but Lightbeam support is not enabled"),
(false, true) => CompilationStrategy::Cranelift,
(false, false) => CompilationStrategy::Auto,
(true, true) => panic!("Can't enable --cranelift and --lightbeam at the same time"),
}
pub fn pick_compilation_strategy(cranelift: bool, lightbeam: bool) -> Result<Strategy> {
Ok(match (lightbeam, cranelift) {
(true, false) => Strategy::Lightbeam,
(false, true) => Strategy::Cranelift,
(false, false) => Strategy::Auto,
(true, true) => bail!("Can't enable --cranelift and --lightbeam at the same time"),
})
}
pub fn init_file_per_thread_logger(prefix: &'static str) {