Skip to content

Commit

Permalink
Misc improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
syrusakbary committed Jul 23, 2020
1 parent 7dd586b commit 2dfa0ed
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,6 @@ authors = ["Wasmer Engineering Team <[email protected]>"]
repository = "https://github.com/wasmerio/wasmer"
description = "Wasmer workspace"
license = "MIT"
include = [
"tests/**/*",
"Cargo.lock",
"Cargo.toml",
"LICENSE",
"Makefile",
"/README.md"
]
readme = "README.md"
edition = "2018"
publish = false
autoexamples = false
Expand Down
5 changes: 2 additions & 3 deletions lib/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ include = [
"Cargo.lock",
"Cargo.toml",
"LICENSE",
"Makefile",
"/README.md"
"README.md"
]
readme = "README.md"
edition = "2018"
Expand All @@ -38,7 +37,7 @@ wasmer-wast = { version = "1.0.0-alpha.1", path = "../../tests/lib/wast", option
wasmer-cache = { version = "1.0.0-alpha.1", path = "../cache", optional = true }
wasm-common = { version = "1.0.0-alpha.1", path = "../wasm-common" }
atty = "0.2"
colored = "1.9"
colored = "2.0"
anyhow = "1.0"
structopt = { version = "0.3", features = ["suggestions"] }
# For the function names autosuggestion
Expand Down
15 changes: 8 additions & 7 deletions lib/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

This crate is the Wasmer CLI.

The recommended way to install Wasmer is via your shell [following the instructions in our repo](https://github.com/wasmerio/wasmer-reborn#1-install-wasmer).
The recommended way to install `wasmer` is via the [wasmer-installer](https://github.com/wasmerio/wasmer-install).

You can install it also via Cargo:
However, you can also install `wasmer` via Cargo (you will need to specify the compilers to use):

```bash
cargo install wasmer-cli
cargo install wasmer-cli --features "singlepass,cranelift"
```

Or by running it inside the codebase:
Or by building it inside the codebase:

```bash
cargo build --release
cargo build --release --features "singlepass,cranelift"
```

> Note: installing Wasmer via Cargo (or manual install) will not install
> the WAPM cli. If you want to use them together, please use the default shell installer.
> Note: installing `wasmer` via Cargo (or manual install) will not install
> the WAPM cli. If you want to use them together, please use the [wasmer installer](https://github.com/wasmerio/wasmer-install).

## Features
Expand All @@ -29,6 +29,7 @@ The Wasmer supports the following features:
* `native` (default): support for the [Native engine].
* `cache` (default): support or automatically caching compiled artifacts.
* `wasi` (default): support for [WASI].
* `experimental-io-devices`: support for experimental IO devices in WASI.
* `emscripten` (default): support for [Emscripten].
* `singlepass`: support for the [Singlepass compiler].
* `cranelift`: support for the [Cranelift compiler].
Expand Down
1 change: 0 additions & 1 deletion lib/engine-jit/src/artifact.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use wasmer_compiler::{CompileError, Features, Triple};
use wasmer_compiler::{CompileModuleInfo, ModuleEnvironment};
use wasmer_engine::{
register_frame_info, Artifact, DeserializeError, GlobalFrameInfoRegistration, SerializeError,
Tunables,
};
#[cfg(feature = "compiler")]
use wasmer_engine::{Engine, SerializableFunctionFrameInfo};
Expand Down
1 change: 1 addition & 0 deletions lib/engine-jit/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use wasmer_compiler::{CompilerConfig, Features, Target};

/// The JIT builder
pub struct JIT<'a> {
#[allow(dead_code)]
compiler_config: Option<&'a dyn CompilerConfig>,
target: Option<Target>,
features: Option<Features>,
Expand Down
4 changes: 2 additions & 2 deletions lib/engine-jit/src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ impl Engine for JITEngine {
#[cfg(not(feature = "compiler"))]
fn compile(
&self,
binary: &[u8],
tunables: &dyn Tunables,
_binary: &[u8],
_tunables: &dyn Tunables,
) -> Result<Arc<dyn Artifact>, CompileError> {
Err(CompileError::Codegen(
"The JITEngine is operating in headless mode, so it can not compile Modules."
Expand Down

0 comments on commit 2dfa0ed

Please sign in to comment.