Skip to content

Commit 6f7c554

Browse files
authored
Fix common capitalization errors in documentation (#14562)
WASM -> Wasm MacOS -> macOS Nothing important, just something that annoyed me for a while :)
1 parent bfcb19a commit 6f7c554

File tree

33 files changed

+51
-51
lines changed

33 files changed

+51
-51
lines changed

.cargo/config_fast_builds.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#
88
# ## LLD
99
#
10-
# LLD is a linker from the LLVM project that supports Linux, Windows, MacOS, and WASM. It has the greatest
10+
# LLD is a linker from the LLVM project that supports Linux, Windows, macOS, and Wasm. It has the greatest
1111
# platform support and the easiest installation process. It is enabled by default in this file for Linux
12-
# and Windows. On MacOS, the default linker yields higher performance than LLD and is used instead.
12+
# and Windows. On macOS, the default linker yields higher performance than LLD and is used instead.
1313
#
1414
# To install, please scroll to the corresponding table for your target (eg. `[target.x86_64-pc-windows-msvc]`
1515
# for Windows) and follow the steps under `LLD linker`.
@@ -25,7 +25,7 @@
2525
# your corresponding target, disable LLD by commenting out its `-Clink-arg=...` line, and enable Mold by
2626
# *uncommenting* its `-Clink-arg=...` line.
2727
#
28-
# There is a fork of Mold named Sold that supports MacOS, but it is unmaintained and is about the same speed as
28+
# There is a fork of Mold named Sold that supports macOS, but it is unmaintained and is about the same speed as
2929
# the default ld64 linker. For this reason, it is not included in this file.
3030
#
3131
# For more information, please see Mold's repository at <https://github.com/rui314/mold>.
@@ -142,7 +142,7 @@ rustflags = [
142142
]
143143

144144
# Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'
145-
# In most cases the gains are negligible, but if you are on macos and have slow compile times you should see significant gains.
145+
# In most cases the gains are negligible, but if you are on macOS and have slow compile times you should see significant gains.
146146
# [profile.dev]
147147
# debug = 1
148148

.github/actions/install-linux-deps/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# repository before you can use this action.
1313
#
1414
# This action will only install dependencies when the current operating system is Linux. It will do
15-
# nothing on any other OS (MacOS, Windows).
15+
# nothing on any other OS (macOS, Windows).
1616

1717
name: Install Linux dependencies
1818
description: Installs the dependencies necessary to build Bevy on Linux.

.github/start-wasm-example/tests/wasm_example.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test.beforeEach(async ({ page }) => {
66

77
const MAX_TIMEOUT_FOR_TEST = 300_000;
88

9-
test.describe('WASM example', () => {
9+
test.describe('Wasm example', () => {
1010
test('Wait for success', async ({ page }, testInfo) => {
1111
let start = new Date().getTime();
1212

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
run: cargo run -p ci -- lints
7373

7474
miri:
75-
# Explicity use MacOS 14 to take advantage of M1 chip.
75+
# Explicity use macOS 14 to take advantage of M1 chip.
7676
runs-on: macos-14
7777
timeout-minutes: 60
7878
steps:
@@ -231,7 +231,7 @@ jobs:
231231
232232
233233
run-examples-macos-metal:
234-
# Explicity use MacOS 14 to take advantage of M1 chip.
234+
# Explicity use macOS 14 to take advantage of M1 chip.
235235
runs-on: macos-14
236236
timeout-minutes: 30
237237
steps:

.github/workflows/validation-jobs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
npx playwright install --with-deps
210210
cd ../..
211211
212-
- name: First WASM build
212+
- name: First Wasm build
213213
run: |
214214
cargo build --release --example ui --target wasm32-unknown-unknown
215215

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ reflect_functions = ["bevy_internal/reflect_functions"]
354354
[dependencies]
355355
bevy_internal = { path = "crates/bevy_internal", version = "0.15.0-dev", default-features = false }
356356

357-
# WASM does not support dynamic linking.
357+
# Wasm does not support dynamic linking.
358358
[target.'cfg(not(target_family = "wasm"))'.dependencies]
359359
bevy_dylib = { path = "crates/bevy_dylib", version = "0.15.0-dev", default-features = false, optional = true }
360360

@@ -760,7 +760,7 @@ doc-scrape-examples = true
760760
name = "Lines"
761761
description = "Create a custom material to draw 3d lines"
762762
category = "3D Rendering"
763-
# WASM does not support the `POLYGON_MODE_LINE` feature.
763+
# Wasm does not support the `POLYGON_MODE_LINE` feature.
764764
wasm = false
765765

766766
[[example]]

clippy.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
doc-valid-idents = [
22
"GilRs",
33
"glTF",
4-
"MacOS",
4+
"macOS",
55
"NVidia",
66
"OpenXR",
77
"sRGB",

crates/bevy_app/src/panic_handler.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! This module provides panic handlers for [Bevy](https://bevyengine.org)
2-
//! apps, and automatically configures platform specifics (i.e. WASM or Android).
2+
//! apps, and automatically configures platform specifics (i.e. Wasm or Android).
33
//!
44
//! By default, the [`PanicHandlerPlugin`] from this crate is included in Bevy's `DefaultPlugins`.
55
//!
@@ -11,7 +11,7 @@ use crate::Plugin;
1111

1212
/// Adds sensible panic handlers to Apps. This plugin is part of the `DefaultPlugins`. Adding
1313
/// this plugin will setup a panic hook appropriate to your target platform:
14-
/// * On WASM, uses [`console_error_panic_hook`](https://crates.io/crates/console_error_panic_hook), logging
14+
/// * On Wasm, uses [`console_error_panic_hook`](https://crates.io/crates/console_error_panic_hook), logging
1515
/// to the browser console.
1616
/// * Other platforms are currently not setup.
1717
///

crates/bevy_asset/src/io/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#[cfg(all(feature = "file_watcher", target_arch = "wasm32"))]
22
compile_error!(
33
"The \"file_watcher\" feature for hot reloading does not work \
4-
on WASM.\nDisable \"file_watcher\" \
5-
when compiling to WASM"
4+
on Wasm.\nDisable \"file_watcher\" \
5+
when compiling to Wasm"
66
);
77

88
#[cfg(target_os = "android")]

crates/bevy_asset/src/io/wasm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern "C" {
2323
fn worker(this: &Global) -> JsValue;
2424
}
2525

26-
/// Reader implementation for loading assets via HTTP in WASM.
26+
/// Reader implementation for loading assets via HTTP in Wasm.
2727
pub struct HttpWasmAssetReader {
2828
root_path: PathBuf,
2929
}

crates/bevy_asset/src/processor/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl AssetProcessor {
153153
/// Starts the processor in a background thread.
154154
pub fn start(_processor: Res<Self>) {
155155
#[cfg(any(target_arch = "wasm32", not(feature = "multi_threaded")))]
156-
error!("Cannot run AssetProcessor in single threaded mode (or WASM) yet.");
156+
error!("Cannot run AssetProcessor in single threaded mode (or Wasm) yet.");
157157
#[cfg(all(not(target_arch = "wasm32"), feature = "multi_threaded"))]
158158
{
159159
let processor = _processor.clone();
@@ -323,7 +323,7 @@ impl AssetProcessor {
323323
AssetPath::from_path(&path).with_source(source.id())
324324
);
325325
#[cfg(any(target_arch = "wasm32", not(feature = "multi_threaded")))]
326-
error!("AddFolder event cannot be handled in single threaded mode (or WASM) yet.");
326+
error!("AddFolder event cannot be handled in single threaded mode (or Wasm) yet.");
327327
#[cfg(all(not(target_arch = "wasm32"), feature = "multi_threaded"))]
328328
IoTaskPool::get().scope(|scope| {
329329
scope.spawn(async move {

crates/bevy_diagnostic/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bevy_tasks = { path = "../bevy_tasks", version = "0.15.0-dev" }
2424

2525
const-fnv1a-hash = "1.1.0"
2626

27-
# MacOS
27+
# macOS
2828
[target.'cfg(all(target_os="macos"))'.dependencies]
2929
# Some features of sysinfo are not supported by apple. This will disable those features on apple devices
3030
sysinfo = { version = "0.31.0", optional = true, default-features = false, features = [

crates/bevy_diagnostic/src/system_information_diagnostics_plugin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use bevy_ecs::system::Resource;
1111
/// * linux,
1212
/// * windows,
1313
/// * android,
14-
/// * macos
14+
/// * macOS
1515
///
1616
/// NOT supported when using the `bevy/dynamic` feature even when using previously mentioned targets
1717
///
@@ -48,7 +48,7 @@ pub struct SystemInfo {
4848
pub memory: String,
4949
}
5050

51-
// NOTE: sysinfo fails to compile when using bevy dynamic or on iOS and does nothing on wasm
51+
// NOTE: sysinfo fails to compile when using bevy dynamic or on iOS and does nothing on Wasm
5252
#[cfg(all(
5353
any(
5454
target_os = "linux",

crates/bevy_ecs/src/schedule/executor/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub(super) trait SystemExecutor: Send + Sync {
3030
/// Specifies how a [`Schedule`](super::Schedule) will be run.
3131
///
3232
/// The default depends on the target platform:
33-
/// - [`SingleThreaded`](ExecutorKind::SingleThreaded) on WASM.
33+
/// - [`SingleThreaded`](ExecutorKind::SingleThreaded) on Wasm.
3434
/// - [`MultiThreaded`](ExecutorKind::MultiThreaded) everywhere else.
3535
#[derive(PartialEq, Eq, Default, Debug, Copy, Clone)]
3636
pub enum ExecutorKind {

crates/bevy_input/src/keyboard.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ pub enum Key {
840840
/// Scroll up or display previous page of content.
841841
PageUp,
842842
/// Used to remove the character to the left of the cursor. This key value is also used for
843-
/// the key labeled `Delete` on MacOS keyboards.
843+
/// the key labeled `Delete` on macOS keyboards.
844844
Backspace,
845845
/// Remove the currently selected input.
846846
Clear,
@@ -851,7 +851,7 @@ pub enum Key {
851851
/// Cut the current selection. (`APPCOMMAND_CUT`)
852852
Cut,
853853
/// Used to delete the character to the right of the cursor. This key value is also used for the
854-
/// key labeled `Delete` on MacOS keyboards when `Fn` is active.
854+
/// key labeled `Delete` on macOS keyboards when `Fn` is active.
855855
Delete,
856856
/// The Erase to End of Field key. This key deletes all characters from the current cursor
857857
/// position to the end of the current field.

crates/bevy_log/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
)]
66

77
//! This crate provides logging functions and configuration for [Bevy](https://bevyengine.org)
8-
//! apps, and automatically configures platform specific log handlers (i.e. WASM or Android).
8+
//! apps, and automatically configures platform specific log handlers (i.e. Wasm or Android).
99
//!
1010
//! The macros provided for logging are reexported from [`tracing`](https://docs.rs/tracing),
1111
//! and behave identically to it.
@@ -75,7 +75,7 @@ pub(crate) struct FlushGuard(SyncCell<tracing_chrome::FlushGuard>);
7575
/// logging to `stdout`.
7676
/// * Using [`android_log-sys`](https://crates.io/crates/android_log-sys) on Android,
7777
/// logging to Android logs.
78-
/// * Using [`tracing-wasm`](https://crates.io/crates/tracing-wasm) in WASM, logging
78+
/// * Using [`tracing-wasm`](https://crates.io/crates/tracing-wasm) in Wasm, logging
7979
/// to the browser console.
8080
///
8181
/// You can configure this plugin.

crates/bevy_pbr/src/meshlet/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const MESHLET_MESH_MATERIAL_SHADER_HANDLE: Handle<Shader> =
108108
/// This plugin is not compatible with [`Msaa`]. Any camera rendering a [`MeshletMesh`] must have
109109
/// [`Msaa`] set to [`Msaa::Off`].
110110
///
111-
/// This plugin does not work on WASM.
111+
/// This plugin does not work on Wasm.
112112
///
113113
/// Mixing forward+prepass and deferred rendering for opaque materials is not currently supported when using this plugin.
114114
/// You must use one or the other by setting [`crate::DefaultOpaqueRendererMethod`].

crates/bevy_render/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ image = { version = "0.25.2", default-features = false }
6666

6767
# misc
6868
codespan-reporting = "0.11.0"
69-
# `fragile-send-sync-non-atomic-wasm` feature means we can't use WASM threads for rendering
69+
# `fragile-send-sync-non-atomic-wasm` feature means we can't use Wasm threads for rendering
7070
# It is enabled for now to avoid having to do a significant overhaul of the renderer just for wasm.
7171
# When the 'atomics' feature is enabled `fragile-send-sync-non-atomic` does nothing
7272
# and Bevy instead wraps `wgpu` types to verify they are not used off their origin thread.

crates/bevy_render/src/render_resource/pipeline_cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ pub struct PipelineCache {
464464
waiting_pipelines: HashSet<CachedPipelineId>,
465465
new_pipelines: Mutex<Vec<CachedPipeline>>,
466466
/// If `true`, disables asynchronous pipeline compilation.
467-
/// This has no effect on MacOS, wasm, or without the `multi_threaded` feature.
467+
/// This has no effect on macOS, wasm, or without the `multi_threaded` feature.
468468
synchronous_pipeline_compilation: bool,
469469
}
470470

crates/bevy_tasks/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ It is based on [`async-executor`][async-executor], a lightweight executor that a
2222
In order to be able to optimize task execution in multi-threaded environments,
2323
bevy provides three different thread pools via which tasks of different kinds can be spawned.
2424
(The same API is used in single-threaded environments, even if execution is limited to a single thread.
25-
This currently applies to WASM targets.)
25+
This currently applies to Wasm targets.)
2626
The determining factor for what kind of work should go in each pool is latency requirements:
2727

2828
* For CPU-intensive work (tasks that generally spin until completion) we have a standard

crates/bevy_utils/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ use std::{
4949

5050
#[cfg(not(target_arch = "wasm32"))]
5151
mod conditional_send {
52-
/// Use [`ConditionalSend`] to mark an optional Send trait bound. Useful as on certain platforms (eg. WASM),
52+
/// Use [`ConditionalSend`] to mark an optional Send trait bound. Useful as on certain platforms (eg. Wasm),
5353
/// futures aren't Send.
5454
pub trait ConditionalSend: Send {}
5555
impl<T: Send> ConditionalSend for T {}
@@ -64,7 +64,7 @@ mod conditional_send {
6464

6565
pub use conditional_send::*;
6666

67-
/// Use [`ConditionalSendFuture`] for a future with an optional Send trait bound, as on certain platforms (eg. WASM),
67+
/// Use [`ConditionalSendFuture`] for a future with an optional Send trait bound, as on certain platforms (eg. Wasm),
6868
/// futures aren't Send.
6969
pub trait ConditionalSendFuture: std::future::Future + ConditionalSend {}
7070
impl<T: std::future::Future + ConditionalSend> ConditionalSendFuture for T {}

crates/bevy_winit/src/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ pub fn winit_runner<T: Event>(mut app: App) -> AppExit {
768768
let mut runner_state = WinitAppRunnerState::new(app);
769769

770770
trace!("starting winit event loop");
771-
// TODO(clean): the winit docs mention using `spawn` instead of `run` on WASM.
771+
// TODO(clean): the winit docs mention using `spawn` instead of `run` on Wasm.
772772
if let Err(err) = event_loop.run_app(&mut runner_state) {
773773
error!("winit event loop returned an error: {err}");
774774
}

docs-template/EXAMPLE_README.md.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ git checkout v0.4.0
4949
- [iOS](#ios)
5050
- [Setup](#setup-1)
5151
- [Build & Run](#build--run-1)
52-
- [WASM](#wasm)
52+
- [Wasm](#wasm)
5353
- [Setup](#setup-2)
5454
- [Build & Run](#build--run-2)
5555
- [WebGL2 and WebGPU](#webgl2-and-webgpu)
@@ -195,7 +195,7 @@ Example | File | Description
195195
--- | --- | ---
196196
`ios` | [`mobile/src/lib.rs`](./mobile/src/lib.rs) | A 3d Scene with a button and playing sound
197197

198-
## WASM
198+
## Wasm
199199

200200
### Setup
201201

examples/3d/blend_modes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() {
2121
.add_systems(Update, example_control_system);
2222

2323
// Unfortunately, MSAA and HDR are not supported simultaneously under WebGL.
24-
// Since this example uses HDR, we must disable MSAA for WASM builds, at least
24+
// Since this example uses HDR, we must disable MSAA for Wasm builds, at least
2525
// until WebGPU is ready and no longer behind a feature flag in Web browsers.
2626
#[cfg(target_arch = "wasm32")]
2727
app.insert_resource(Msaa::Off);

examples/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ git checkout v0.4.0
7474
- [iOS](#ios)
7575
- [Setup](#setup-1)
7676
- [Build & Run](#build--run-1)
77-
- [WASM](#wasm)
77+
- [Wasm](#wasm)
7878
- [Setup](#setup-2)
7979
- [Build & Run](#build--run-2)
8080
- [WebGL2 and WebGPU](#webgl2-and-webgpu)
@@ -615,7 +615,7 @@ Example | File | Description
615615
--- | --- | ---
616616
`ios` | [`mobile/src/lib.rs`](./mobile/src/lib.rs) | A 3d Scene with a button and playing sound
617617

618-
## WASM
618+
## Wasm
619619

620620
### Setup
621621

examples/app/headless_renderer.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ fn receive_image_from_buffer(
435435
// buffered and receiving will just pick that up.
436436
//
437437
// It may also be worth noting that although on native, the usage of asynchronous
438-
// channels is wholly unnecessary, for the sake of portability to WASM
439-
// we'll use async channels that work on both native and WASM.
438+
// channels is wholly unnecessary, for the sake of portability to Wasm
439+
// we'll use async channels that work on both native and Wasm.
440440

441441
let (s, r) = crossbeam_channel::bounded(1);
442442

examples/scene/scene.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fn save_scene_system(world: &mut World) {
133133

134134
// Writing the scene to a new file. Using a task to avoid calling the filesystem APIs in a system
135135
// as they are blocking
136-
// This can't work in WASM as there is no filesystem access
136+
// This can't work in Wasm as there is no filesystem access
137137
#[cfg(not(target_arch = "wasm32"))]
138138
IoTaskPool::get()
139139
.spawn(async move {

examples/shader/gpu_readback.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ fn map_and_read_buffer(
224224
// buffered and receiving will just pick that up.
225225
//
226226
// It may also be worth noting that although on native, the usage of asynchronous
227-
// channels is wholly unnecessary, for the sake of portability to WASM
228-
// we'll use async channels that work on both native and WASM.
227+
// channels is wholly unnecessary, for the sake of portability to Wasm
228+
// we'll use async channels that work on both native and Wasm.
229229

230230
let (s, r) = crossbeam_channel::unbounded::<()>();
231231

examples/wasm/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
background-color: white;
1919
}
2020
</style>
21-
<title>WASM Example</title>
21+
<title>Wasm Example</title>
2222
</head>
2323
<script type="module">
2424
import init from './target/wasm_example.js'

examples/window/window_settings.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ fn main() {
1717
name: Some("bevy.app".into()),
1818
resolution: (500., 300.).into(),
1919
present_mode: PresentMode::AutoVsync,
20-
// Tells wasm to resize the window according to the available canvas
20+
// Tells Wasm to resize the window according to the available canvas
2121
fit_canvas_to_parent: true,
22-
// Tells wasm not to override default event handling, like F5, Ctrl+R etc.
22+
// Tells Wasm not to override default event handling, like F5, Ctrl+R etc.
2323
prevent_default_event_handling: false,
2424
window_theme: Some(WindowTheme::Dark),
2525
enabled_buttons: bevy::window::EnabledButtons {

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
pub use bevy_internal::*;
5050

51-
// WASM does not support dynamic linking.
51+
// Wasm does not support dynamic linking.
5252
#[cfg(all(feature = "dynamic_linking", not(target_family = "wasm")))]
5353
#[allow(unused_imports)]
5454
use bevy_dylib;

0 commit comments

Comments
 (0)