Skip to content

Commit a431dfa

Browse files
Fix some typos. (#21123)
1 parent 12b2da9 commit a431dfa

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exclude =
1010
./system/lib/, # system libraries
1111
./cache/, # download/built content
1212
.git
13-
# The ports plugins have a lot of unused imports becuase
13+
# The ports plugins have a lot of unused imports because
1414
# they need to implement the specific plugin APIs
1515
per-file-ignores =
1616
./tools/ports/*.py: U100

ChangeLog.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ See docs/process.md for more on how version tagging works.
2525
-----------------
2626
- The core stack manipulation functions (`stackSave`, `stackRestore`,
2727
`stackAlloc`) are no longer exported by default. Users of these function
28-
now need to depend on them explictly (either via `__deps` attributes or via
28+
now need to depend on them explicitly (either via `__deps` attributes or via
2929
`-sEXPORTED_FUNCTIONS`). (#21075)
3030
- Building with `pthreads+EXPORT_ES6` will now emit the worker file as
3131
`NAME.worker.mjs` rather than `.js`. This is a necessary breaking change to
@@ -66,7 +66,7 @@ See docs/process.md for more on how version tagging works.
6666

6767
3.1.51 - 12/13/23
6868
-----------------
69-
- Support for explicitly targeting the legacy Interet Explorer or EdgeHTML
69+
- Support for explicitly targeting the legacy Internet Explorer or EdgeHTML
7070
(edge version prior to the chromium-based edge) browsers via
7171
`-sMIN_EDGE_VERSION/-sMIN_IE_VERSION` was removed. (#20881)
7272
- Emscripten is now more strict about handling unsupported shared library
@@ -112,8 +112,8 @@ See docs/process.md for more on how version tagging works.
112112
the `DEFAULT_TO_CXX` setting now only applies when linking and not when
113113
compiling. (#20712)
114114
- JavaScript library code can now use the full range of ES6 features and we rely
115-
on closure compiler to transpile for ES5 when targetting older browsers.
116-
For those that would rather perform transpilation seperately outside of
115+
on closure compiler to transpile for ES5 when targeting older browsers.
116+
For those that would rather perform transpilation separately outside of
117117
emscripten you can use the `-sPOLYFILL=0` setting. (#20700)
118118
- libcxx, libcxxabi, libunwind, and compiler-rt were updated to LLVM 17.0.4.
119119
(#20705, #20707, and #20708)
@@ -145,7 +145,7 @@ See docs/process.md for more on how version tagging works.
145145
JavaScript code. (#20551)
146146
- A new top-level `bootstrap` script was added. This script is for emscripten
147147
developers and helps take a care of post-checkout tasks such as `npm install`.
148-
If this script needs to be run (e.g. becuase package.json was changed, emcc
148+
If this script needs to be run (e.g. because package.json was changed, emcc
149149
will exit with an error. (#19736)
150150
- If exceptions are disabled, using `new` together with `std::nothrow` no
151151
longer aborts if the allocation fails. Instead `nullptr` is returned now.
@@ -189,7 +189,7 @@ See docs/process.md for more on how version tagging works.
189189
-----------------
190190
- The `wasmTable` global is now a JS library function that will only be included
191191
as needed. Code that references `wasmTable` will no need to declare a
192-
dependency on it. It can also be explictly included using
192+
dependency on it. It can also be explicitly included using
193193
`-sEXPORTED_RUNTIME_METHODS=wasmTable`.
194194
- libunwind updated to LLVM 16.0.6. (#20088)
195195
- The `--minify=0` commnad line flag will now preserve comments as well as
@@ -206,7 +206,7 @@ See docs/process.md for more on how version tagging works.
206206
- The `USE_GLFW` settings now defaults to 0 rather than 2. This matches other
207207
other settings such as `USE_SDL` that default to 0 these days and also matches
208208
the existing behaviour for `MINIMAL_RUNTIME` and `STRICT` mode.
209-
If you use GLFW you now need to explictly opt into it using `-sUSE_GLFW` or
209+
If you use GLFW you now need to explicitly opt into it using `-sUSE_GLFW` or
210210
`-lglfw`. (#19939)
211211
- A new settings `TABLE_BASE` was introduced that can be used to place static
212212
function addresses (table slots) at a certain offset. This defaults to 1
@@ -256,7 +256,7 @@ See docs/process.md for more on how version tagging works.
256256
`-sMIN_NODE_VERSION=101900` which will apply the previous minimum version of
257257
10.19.0. (#19192).
258258
- The log message that emcc will sometime print (for example when auto-building
259-
system libraries) can now be completely supressed by running with
259+
system libraries) can now be completely suppressed by running with
260260
`EMCC_LOGGING=0`.
261261
- Runtime dynamic linking symbols such as dlopen and dlsym will no longer cause
262262
a linker error when building without `-sMAIN_MODULE`. Instead stub functions
@@ -333,13 +333,13 @@ See docs/process.md for more on how version tagging works.
333333
- stringToUTF8
334334
- lengthBytesUTF8
335335
If you use any of these functions in your JS code you will now need to include
336-
them explictly in one of the following ways:
336+
them explicitly in one of the following ways:
337337
- Add them to a `__deps` entry in your JS library file (with leading $)
338338
- Add them to `DEFAULT_LIBRARY_FUNCS_TO_INCLUDE` (with leading $)
339339
- Add them to `EXPORTED_FUNCTIONS` (without leading $)
340340
- Set `-sLEGACY_RUNTIME` to include all of them at once.
341341
- `FS.loadFilesFromDB` and `FS.saveFilesToDB` were removed. We think it's
342-
unlikly there were any users of these functions since there is now a separate
342+
unlikely there were any users of these functions since there is now a separate
343343
IDBFS filesystem for folks that want persistence. (#19049)
344344
- `allocateUTF8` and `allocateUTF8OnStack` library function moved to
345345
`library_legacy.js`. Prefer the more accurately named `stringToNewUTF8` and
@@ -360,7 +360,7 @@ See docs/process.md for more on how version tagging works.
360360
- Fix for using `EM_JS` functions defined in other object files. This was a bug
361361
that was introduced when `LLD_REPORT_UNDEFINED` was enabled by default back in
362362
3.1.28. (#18928)
363-
- The prefered way to enable pthread is now to just the the standard `-pthread`
363+
- The preferred way to enable pthreads is now to just use the standard `-pthread`
364364
flag. The `-sUSE_PTHREADS` setting still works but is marked as legacy and
365365
will generate a warning in `-sSTRICT` mode.
366366
- When targeting node, and using `-sMODULARIZE`, we no longer internally catch

site/source/docs/getting_started/FAQ.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ with
586586
Why do I get a ``NameError`` or ``a problem occurred in evaluating content after a "-s"`` when I use a ``-s`` option?
587587
=====================================================================================================================
588588

589-
This can occur if you have non-trival strings in ``-s`` argument and are having
589+
This can occur if you have non-trivial strings in ``-s`` argument and are having
590590
trouble getting the shell quoting / escaping correct.
591591

592592
Using the simpler list form (without quotes, spaces or square brackets) can
@@ -603,7 +603,7 @@ It is also possible to use a **response file**, that is,
603603
604604

605605
with ``extra.txt`` being a plain text file that contains ``foo`` and ``bar`` on
606-
seperate lines.
606+
separate lines.
607607

608608
How do I specify ``-s`` options in a CMake project?
609609
===================================================

src/library_syscall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ var SyscallsLibrary = {
143143
'$FS',
144144
// The dependency of FS on `mmapAlloc` and `mmapAlloc` on
145145
// `emscripten_builtin_memalign` are not encoding as hard dependencies,
146-
// so we need to explictly depend on them here to ensure a working
146+
// so we need to explicitly depend on them here to ensure a working
147147
// `FS.mmap`.
148148
// `emscripten_builtin_memalign`).
149149
'$mmapAlloc',

test/common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ def env_modify(updates):
322322
# on the mock library is probably not worth the benefit.
323323
old_env = os.environ.copy()
324324
print("env_modify: " + str(updates))
325-
# Seting a value to None means clear the environment variable
325+
# Setting a value to None means clear the environment variable
326326
clears = [key for key, value in updates.items() if value is None]
327327
updates = {key: value for key, value in updates.items() if value is not None}
328328
os.environ.update(updates)
@@ -1652,7 +1652,7 @@ def get_freetype_library(self):
16521652
'-Wno-pointer-bool-conversion',
16531653
'-Wno-shift-negative-value',
16541654
'-Wno-gnu-offsetof-extensions',
1655-
# And becuase gnu-offsetof-extensions is a new warning:
1655+
# And because gnu-offsetof-extensions is a new warning:
16561656
'-Wno-unknown-warning-option',
16571657
]
16581658
return self.get_library(os.path.join('third_party', 'freetype'),
@@ -1861,7 +1861,7 @@ class Reporting(Enum):
18611861
NONE = 0
18621862
# Include the JS helpers for reporting results
18631863
JS_ONLY = 1
1864-
# Include C/C++ reporting code (REPORT_RESULT mactros) as well as JS helpers
1864+
# Include C/C++ reporting code (REPORT_RESULT macros) as well as JS helpers
18651865
FULL = 2
18661866

18671867

test/core/test_stdio_locking.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Regression test for stdio locking. If file locking is not enabled the
33
* threads will race to write the file output buffer and we will see lines
44
* that are longer or shorter then 100 characters. When locking is
5-
* working/enabled each 100 charactor line will be printed seperately.
5+
* working/enabled each 100 character line will be printed separately.
66
*
77
* See:
88
* musl/src/stdio/__lockfile.c

test/test_core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6098,15 +6098,15 @@ def test_unary_literal(self):
60986098
self.do_core_test('test_unary_literal.cpp')
60996099

61006100
@crossplatform
6101-
# Explictly set LANG here since new versions of node expose
6101+
# Explicitly set LANG here since new versions of node expose
61026102
# `navigator.languages` which emscripten will honor and we
61036103
# want the test output to be consistent.
61046104
@with_env_modify({'LANG': 'en_US.UTF-8'})
61056105
def test_env(self):
61066106
self.do_core_test('test_env.c', regex=True)
61076107

61086108
@crossplatform
6109-
# Explictly set LANG here since new versions of node expose
6109+
# Explicitly set LANG here since new versions of node expose
61106110
# `navigator.languages` which emscripten will honor and we
61116111
# want the test output to be consistent.
61126112
@with_env_modify({'LANG': 'en_US.UTF-8'})

test/test_other.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7388,7 +7388,7 @@ def test_js_lib_native_deps(self):
73887388

73897389
def test_js_lib_native_deps_extra(self):
73907390
# Similar to above but the JS symbol is not used by the native code.
7391-
# Instead is it explictly injected using `extraLibraryFuncs`.
7391+
# Instead is it explicitly injected using `extraLibraryFuncs`.
73927392
create_file('lib.js', r'''
73937393
addToLibrary({
73947394
jsfunc__deps: ['raise'],
@@ -14222,7 +14222,7 @@ def test_memory64_proxies(self):
1422214222
def test_no_minify(self):
1422314223
# Test that comments are preserved with `--minify=0` is used, even in `-Oz` builds.
1422414224
# This allows the output of emscripten to be run through the closure compiler as
14225-
# as a seperate build step.
14225+
# as a separate build step.
1422614226
create_file('pre.js', '''
1422714227
/**
1422814228
* This comment should be preserved

tools/building.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ def map_to_js_libs(library_name):
11391139
'SDL': ['library_sdl.js'],
11401140
'uuid': ['library_uuid.js'],
11411141
'websocket': ['library_websocket.js'],
1142-
# These 4 libraries are seperate under glibc but are all rolled into
1142+
# These 4 libraries are separate under glibc but are all rolled into
11431143
# libc with musl. For compatibility with glibc we just ignore them
11441144
# completely.
11451145
'dl': [],

tools/link.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -914,10 +914,10 @@ def phase_linker_setup(options, state, newargs):
914914

915915
if 'GLOBAL_BASE' not in user_settings and not settings.SHRINK_LEVEL and not settings.OPT_LEVEL:
916916
# When optimizing for size it helps to put static data first before
917-
# the stack (sincs this makes instructions for accessing this data
917+
# the stack (since this makes instructions for accessing this data
918918
# use a smaller LEB encoding).
919919
# However, for debugability is better to have the stack come first
920-
# (becuase stack overflows will trap rather than corrupting data).
920+
# (because stack overflows will trap rather than corrupting data).
921921
settings.STACK_FIRST = True
922922

923923
# Default to TEXTDECODER=2 (always use TextDecoder to decode UTF-8 strings)
@@ -2327,9 +2327,9 @@ def modularize():
23272327
shared.target_environment_may_be('web'):
23282328
async_emit = 'async '
23292329

2330-
# Return the incoming `moduleArg`. This is is equeivielt to the `Module` var within the
2331-
# generated code but its not run through closure minifiection so we can reference it in
2332-
# the the return statement.
2330+
# Return the incoming `moduleArg`. This is is equivalent to the `Module` var within the
2331+
# generated code but its not run through closure minification so we can reference it in
2332+
# the return statement.
23332333
return_value = 'moduleArg'
23342334
if settings.WASM_ASYNC_COMPILATION:
23352335
return_value += '.ready'

tools/system_libs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ def do_build(self, out_filename, generate_only=False):
575575
if not generate_only:
576576
run_ninja(build_dir)
577577
else:
578-
# Use a seperate build directory to the ninja flavor so that building without
578+
# Use a separate build directory to the ninja flavor so that building without
579579
# EMCC_USE_NINJA doesn't clobber the ninja build tree
580580
build_dir += '-tmp'
581581
utils.safe_ensure_dirs(build_dir)

0 commit comments

Comments
 (0)