Build WASM binaries as part of cargo build

core/utils/wasm-builder-runner/README.md

@@ -1,10 +1,10 @@
 # WASM builder runner
 
-As cargo just contains millions of bugs when it comes to correct dependency and feature
+As cargo contains many bugs when it comes to correct dependency and feature
 resolution, we need this little tool. See <https://github.com/rust-lang/cargo/issues/5730> for
 more information.
 
-It will create a project that itself will call `substrate-wasm-builder` to not let any dependency
-from `substrate-wasm-builder` influence the main project's dependencies.
+It will create a project that will call `substrate-wasm-builder` to prevent any dependencies
+from `substrate-wasm-builder` influencing the main project's dependencies.
 
 For more information see <https://crates.io/substrate-wasm-builder>

core/utils/wasm-builder-runner/src/lib.rs

@@ -16,12 +16,12 @@
 
 //! # WASM builder runner
 //!
-//! Since cargo contains millions of bugs when it comes to correct dependency and feature
+//! Since cargo contains many bugs when it comes to correct dependency and feature
 //! resolution, we need this little tool. See <https://github.com/rust-lang/cargo/issues/5730> for
 //! more information.
 //!
-//! It will create a project that itself will call `substrate-wasm-builder` to not let any dependency
-//! from `substrate-wasm-builder` influence the main project's dependencies.
+//! It will create a project that will call `substrate-wasm-builder` to prevent any dependencies
+//! from `substrate-wasm-builder` influencing the main project's dependencies.
 //!
 //! For more information see <https://crates.io/substrate-wasm-builder>
 
@@ -76,7 +76,7 @@ impl WasmBuilderSource {
 	}
 }
 
-/// Build the currently build project as WASM binary.
+/// Build the currently built project as WASM binary.
 ///
 /// The current project is determined using the `CARGO_MANIFEST_DIR` environment variable.
 ///
@@ -192,7 +192,7 @@ fn provide_dummy_wasm_binary(file_path: &Path) {
 }
 
 /// Generate the `rerun-if-changed` instructions for cargo to make sure that the WASM binary is
-/// rebuild when needed.
+/// rebuilt when needed.
 fn generate_rerun_if_changed_instructions() {
 	// Make sure that the `build.rs` is called again if one of the following env variables changes.
 	println!("cargo:rerun-if-env-changed={}", SKIP_BUILD_ENV);

core/utils/wasm-builder/README.md

@@ -1,13 +1,13 @@
 # substrate-wasm-builder
 
-## WASM builder is an utility for building a project as a WASM binary
+## WASM builder is a utility for building a project as a WASM binary
 
 The WASM builder is a tool that integrates the building of a WASM binary of your project into the main
 `cargo` build process.
 
 ### Project setup
 
-A project that should be compiled as WASM binary needs to add a `build.rs`, add
+A project that should be compiled as a WASM binary needs to add a `build.rs`, add
 `substrate-wasm-builder-runner` as dependency into `build-dependencies` and requires to have a
 feature called `no-std`. The `build.rs` needs to contain the following code:
 
@@ -26,18 +26,18 @@ fn main() {
 
 The `no-std` feature will be enabled by WASM builder while compiling your project to WASM.
 
-As a last step you need to add the following to your project:
+As a last step, you need to add the following to your project:
 
 ```rust,nocompile
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 ```
 
-This will include the generated wasm binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`.
-The former is the WASM binary compacted and the later without compaction.
+This will include the generated WASM binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`.
+The former is the WASM binary compacted and the latter without compaction.
 
 ### Environment variables
 
-By using environment variables, you can configure which WASM binaries are build and how:
+By using environment variables, you can configure which WASM binaries to build and how:
 
 - `SKIP_WASM_BUILD` - Skips building any WASM binary. This is useful when only native should be recompiled.
 - `BUILD_DUMMY_WASM_BINARY` - Builds dummy WASM binaries. These dummy binaries are empty and useful

core/utils/wasm-builder/src/lib.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-//! # WASM builder is an utility for building a project as a WASM binary
+//! # WASM builder is a utility for building a project as a WASM binary
 //!
 //! The WASM builder is a tool that integrates the process of building the WASM binary of your project into the main
 //! `cargo` build process.
@@ -50,7 +50,7 @@
 //! ```
 //!
 //! This will include the generated WASM binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`.
-//! The former is a compact WASM binary and the later is not compacted.
+//! The former is a compact WASM binary and the latter is not compacted.
 //!
 //! ## Environment variables
 //!
@@ -85,16 +85,16 @@ const SKIP_BUILD_ENV: &str = "SKIP_WASM_BUILD";
 /// Environment variable to force a certain build type when building the WASM binary.
 /// Expects "debug" or "release" as value.
 ///
-/// By default the WASM binary uses the same build type a the main cargo build.
+/// By default the WASM binary uses the same build type as the main cargo build.
 const WASM_BUILD_TYPE_ENV: &str = "WASM_BUILD_TYPE";
 
-/// Build the currently build project as WASM binary.
+/// Build the currently built project as WASM binary.
 ///
 /// The current project is determined by using the `CARGO_MANIFEST_DIR` environment variable.
 ///
 /// `file_name` - The name + path of the file being generated. The file contains the
-///               constant `WASM_BINARY` which contains the build wasm binary.
-/// `cargo_manifest` - The path to the `Cargo.toml` of the project that should be build.
+///               constant `WASM_BINARY`, which contains the built WASM binary.
+/// `cargo_manifest` - The path to the `Cargo.toml` of the project that should be built.
 pub fn build_project(file_name: &str, cargo_manifest: &str) {
 	if check_skip_build() {
 		return;

core/utils/wasm-builder/src/wasm_project.rs

@@ -95,7 +95,7 @@ pub fn create_and_compile(cargo_manifest: &Path) -> (WasmBinary, WasmBinaryBloat
 
 /// Find the `Cargo.lock` relative to the `OUT_DIR` environment variable.
 ///
-/// If the `Cargo.lock` can not be found, we emit a warning and return `None`.
+/// If the `Cargo.lock` cannot be found, we emit a warning and return `None`.
 fn find_cargo_lock(cargo_manifest: &Path) -> Option<PathBuf> {
 	let mut path = build_helper::out_dir();
 
@@ -231,7 +231,7 @@ fn create_project(cargo_manifest: &Path, wasm_workspace: &Path) -> PathBuf {
 	project_folder
 }
 
-/// Returns if the project should be build a release.
+/// Returns if the project should be built as a release.
 fn is_release_build() -> bool {
 	if let Ok(var) = env::var(crate::WASM_BUILD_TYPE_ENV) {
 		match var.as_str() {
@@ -270,7 +270,7 @@ fn build_project(project: &Path) {
 	}
 }
 
-/// Compact the WASM binary using `wasm-gc` and returns the path to the bloaty WASM binary.
+/// Compact the WASM binary using `wasm-gc`. Returns the path to the bloaty WASM binary.
 fn compact_wasm_file(
 	project: &Path,
 	cargo_manifest: &Path,
@@ -297,7 +297,7 @@ fn compact_wasm_file(
 }
 
 /// Generate the `rerun-if-changed` instructions for cargo to make sure that the WASM binary is
-/// rebuild when needed.
+/// rebuilt when needed.
 fn generate_rerun_if_changed_instructions(
 	cargo_manifest: &Path,
 	project_folder: &Path,