Skip to content

Commit

Permalink
Merge #1976
Browse files Browse the repository at this point in the history
1976: Fix spelling of WASM and Web Assembly r=syrusakbary a=webmaster128

# Description

"The pain is real."

# Review

- [ ] Add a short description of the the change to the CHANGELOG.md file


Co-authored-by: Simon Warta <[email protected]>
Co-authored-by: Syrus Akbary <[email protected]>
  • Loading branch information
3 people authored Jan 4, 2021
2 parents db41a5d + 62fd20c commit 19e1ca8
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions docs/migration_to_1.0.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ to make migrating to the new API as simple as possible.

## Rationale for changes in 1.0.0

Wasmer 0.x was great but as the WASM community and standards evolve we felt the need to make Wasmer also follow these
Wasmer 0.x was great but as the Wasm community and standards evolve we felt the need to make Wasmer also follow these
changes.

Wasmer 1.x is what we think a necessary rewrite of a big part of the project to make it more future-proof.
Expand Down Expand Up @@ -70,9 +70,9 @@ The figure above shows the core Wasmer crates and their dependencies with transi

Wasmer 1.0.0 has two core architectural abstractions: engines and compilers.

An engine is a system that processes WASM with a compiler and prepares it to be executed.
An engine is a system that processes Wasm with a compiler and prepares it to be executed.

A compiler is a system that translates WASM into a format that can be understood
A compiler is a system that translates Wasm into a format that can be understood
more directly by a real computer: machine code.

For example, in the [examples] you'll see that we are using the JIT engine and the Cranelift compiler. The JIT engine
Expand Down
6 changes: 3 additions & 3 deletions examples/early_exit.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//! There are cases where you may want to interrupt this synchronous execution of the WASM module
//! There are cases where you may want to interrupt this synchronous execution of the Wasm module
//! while the it is calling a host function. This can be useful for saving resources, and not
//! returning back to the guest WASM for execution, when you already know the WASM execution will
//! returning back to the guest Wasm for execution, when you already know the Wasm execution will
//! fail, or no longer be needed.
//!
//! In this example, we will run a WASM module that calls the imported host function
//! In this example, we will run a Wasm module that calls the imported host function
//! interrupt_execution. This host function will immediately stop executing the WebAssembly module.
//!
//! You can run the example directly by executing in Wasmer root:
Expand Down
2 changes: 1 addition & 1 deletion examples/imports_exports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

// Here we go.
//
// The WASM module exports some entities:
// The Wasm module exports some entities:
// * A function: `guest_function`
// * A global: `guest_global`
// * A memory: `guest_memory`
Expand Down
2 changes: 1 addition & 1 deletion examples/imports_function_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//! globals and tables.
//!
//! In this example, we'll create a system for getting and adjusting a counter value. However, host
//! functions are not limited to storing data outside of WASM, they're normal host functions and
//! functions are not limited to storing data outside of Wasm, they're normal host functions and
//! can do anything that the host can do.
//!
//! 1. There will be a `get_counter` function that will return an i32 of
Expand Down
4 changes: 2 additions & 2 deletions lib/c-api/src/deprecated/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ impl From<wasmer_value_t> for Val {
tag: wasmer_value_tag::WASM_F64,
value: wasmer_value { F64 },
} => Val::F64(F64),
_ => unreachable!("unknown WASM type"),
_ => unreachable!("unknown Wasm type"),
}
}
}
Expand Down Expand Up @@ -145,7 +145,7 @@ impl From<wasmer_value_tag> for ValType {
wasmer_value_tag::WASM_I64 => ValType::I64,
wasmer_value_tag::WASM_F32 => ValType::F32,
wasmer_value_tag::WASM_F64 => ValType::F64,
_ => unreachable!("unknown WASM type"),
_ => unreachable!("unknown Wasm type"),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/c-api/tests/deprecated/test-emscripten-import-object.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

static bool host_print_called = false;

// Host function that will be imported into the Web Assembly Instance
// Host function that will be imported into the WebAssembly Instance
void host_print(const wasmer_instance_context_t *ctx, int32_t ptr, int32_t len)
{
host_print_called = true;
Expand Down
2 changes: 1 addition & 1 deletion lib/c-api/tests/deprecated/test-import-object.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

bool static print_str_called = false;

// Host function that will be imported into the Web Assembly Instance
// Host function that will be imported into the WebAssembly Instance
void print_str(const wasmer_instance_context_t *ctx, int32_t ptr, int32_t len)
{
print_str_called = true;
Expand Down
2 changes: 1 addition & 1 deletion lib/c-api/tests/deprecated/test-imports.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

bool static print_str_called = false;

// Host function that will be imported into the Web Assembly Instance
// Host function that will be imported into the WebAssembly Instance
void print_str(const wasmer_instance_context_t *ctx, int32_t ptr, int32_t len)
{
print_str_called = true;
Expand Down
2 changes: 1 addition & 1 deletion lib/c-api/tests/deprecated/test-wasi-import-object.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

static bool host_print_called = false;

// Host function that will be imported into the Web Assembly Instance
// Host function that will be imported into the WebAssembly Instance
void host_print(const wasmer_instance_context_t *ctx, int32_t ptr, int32_t len)
{
host_print_called = true;
Expand Down
4 changes: 2 additions & 2 deletions lib/compiler-cranelift/src/translator/code_translator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1432,8 +1432,8 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
let shuffled = builder.ins().shuffle(a, b, mask);
state.push1(shuffled)
// At this point the original types of a and b are lost; users of this value (i.e. this
// WASM-to-CLIF translator) may need to raw_bitcast for type-correctness. This is due
// to WASM using the less specific v128 type for certain operations and more specific
// Wasm-to-CLIF translator) may need to raw_bitcast for type-correctness. This is due
// to Wasm using the less specific v128 type for certain operations and more specific
// types (e.g. i8x16) for others.
}
Operator::I8x16Swizzle => {
Expand Down
2 changes: 1 addition & 1 deletion tests/wast/spec/proposals/simd/simd_conversions.wast
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;; Web Assembly SIMD-related type conversion tests
;; WebAssembly SIMD-related type conversion tests

(module
;; Floating point to integer with saturation
Expand Down
2 changes: 1 addition & 1 deletion tests/wast/spec/proposals/simd/simd_splat.wast
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
(assert_return (invoke "as-i32x4_trunc_s_f32x4_sat-operand" (f32.const 1.1)) (v128.const i32x4 1 1 1 1))


;; As the argument of control constructs and WASM instructions
;; As the argument of control constructs and Wasm instructions

(module
(global $g (mut v128) (v128.const f32x4 0.0 0.0 0.0 0.0))
Expand Down

0 comments on commit 19e1ca8

Please sign in to comment.