about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorWho? Me?! <mark-i-m@users.noreply.github.com>2020-03-08 21:21:33 -0500
committerWho? Me?! <mark-i-m@users.noreply.github.com>2020-03-12 14:11:01 -0500
commit551b1892bf8f6269b5692e77ed7a815a05cf32b2 (patch)
tree735935a35c8ed0c983313e8ffc3beb94c1bcccfd /src/doc
parentc15fc13edf1eed2a8e81e5e508a33fca935b8784 (diff)
downloadrust-551b1892bf8f6269b5692e77ed7a815a05cf32b2.tar.gz
rust-551b1892bf8f6269b5692e77ed7a815a05cf32b2.zip
Use common (American) spellings
Co-Authored-By: Yuki Okushi <huyuumi.dev@gmail.com>
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/rustc-dev-guide/src/backend/codegen.md8
-rw-r--r--src/doc/rustc-dev-guide/src/backend/lowering-mir.md6
-rw-r--r--src/doc/rustc-dev-guide/src/backend/monomorph.md8
3 files changed, 11 insertions, 11 deletions
diff --git a/src/doc/rustc-dev-guide/src/backend/codegen.md b/src/doc/rustc-dev-guide/src/backend/codegen.md
index 5e277fc3c60..d7bad9cfbba 100644
--- a/src/doc/rustc-dev-guide/src/backend/codegen.md
+++ b/src/doc/rustc-dev-guide/src/backend/codegen.md
@@ -48,8 +48,8 @@ There are a few benefits to using LLVM:
 Once LLVM IR for all of the functions and statics, etc is built, it is time to
 start running LLVM and its optimization passes. LLVM IR is grouped into
 "modules". Multiple "modules" can be codegened at the same time to aid in
-multi-core utilisation. These "modules" are what we refer to as _codegen
-units_. These units were established way back during monomorphisation
+multi-core utilization. These "modules" are what we refer to as _codegen
+units_. These units were established way back during monomorphization
 collection phase.
 
 Once LLVM produces objects from these modules, these objects are passed to the
@@ -57,8 +57,8 @@ linker along with, optionally, the metadata object and an archive or an
 executable is produced.
 
 It is not necessarily the codegen phase described above that runs the
-optimisations. With certain kinds of LTO, the optimisation might happen at the
-linking time instead. It is also possible for some optimisations to happen
+optimizations. With certain kinds of LTO, the optimization might happen at the
+linking time instead. It is also possible for some optimizations to happen
 before objects are passed on to the linker and some to happen during the
 linking.
 
diff --git a/src/doc/rustc-dev-guide/src/backend/lowering-mir.md b/src/doc/rustc-dev-guide/src/backend/lowering-mir.md
index 42536b9553b..ccc09bee681 100644
--- a/src/doc/rustc-dev-guide/src/backend/lowering-mir.md
+++ b/src/doc/rustc-dev-guide/src/backend/lowering-mir.md
@@ -2,7 +2,7 @@
 
 Now that we have a list of symbols to generate from the collector, we need to
 generate some sort of codegen IR. In this chapter, we will assume LLVM IR,
-since that's what rustc usually uses. The actual monomorphisation is performed
+since that's what rustc usually uses. The actual monomorphization is performed
 as we go, while we do the translation.
 
 Recall that the backend is started by
@@ -34,13 +34,13 @@ Before a function is translated a number of simple and primitive analysis
 passes will run to help us generate simpler and more efficient LLVM IR. An
 example of such an analysis pass would be figuring out which variables are
 SSA-like, so that we can translate them to SSA directly rather than relying on
-LLVM's `mem2reg` for those variables. The anayses can be found in
+LLVM's `mem2reg` for those variables. The analysis can be found in
 [`rustc_codegen_ssa::mir::analyze`][mirana].
 
 [mirana]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_codegen_ssa/mir/analyze/index.html
   
 Usually a single MIR basic block will map to a LLVM basic block, with very few
-exceptions: intrinsic or function calls and less basic MIR statemenets like
+exceptions: intrinsic or function calls and less basic MIR statements like
 `assert` can result in multiple basic blocks. This is a perfect lede into the
 non-portable LLVM-specific part of the code generation. Intrinsic generation is
 fairly easy to understand as it involves very few abstraction levels in between
diff --git a/src/doc/rustc-dev-guide/src/backend/monomorph.md b/src/doc/rustc-dev-guide/src/backend/monomorph.md
index 0d2de4d2d00..5ea8ba4f0f4 100644
--- a/src/doc/rustc-dev-guide/src/backend/monomorph.md
+++ b/src/doc/rustc-dev-guide/src/backend/monomorph.md
@@ -41,7 +41,7 @@ fn main() {
 }
 ```
 
-The monomorphisation collector will give you a list of `[main, banana,
+The monomorphization collector will give you a list of `[main, banana,
 peach::<u64>]`. These are the functions that will have machine code generated
 for them. Collector will also add things like statics to that list.
 
@@ -49,9 +49,9 @@ See [the collector rustdocs][collect] for more info.
 
 [collect]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/monomorphize/collector/index.html
 
-The monomorphisation collector is run just before MIR lowering and codegen.
+The monomorphization collector is run just before MIR lowering and codegen.
 [`rustc_codegen_ssa::base::codegen_crate`][codegen1] calls the
-[`collect_and_partition_mono_items`][mono] query, which does monomorphisation
+[`collect_and_partition_mono_items`][mono] query, which does monomorphization
 collection and then partitions them into [codegen
 units](../appendix/glossary.md).
 
@@ -60,7 +60,7 @@ units](../appendix/glossary.md).
 
 ## Polymorphization
 
-As mentioned above, monomorphisation produces fast code, but it comes at the
+As mentioned above, monomorphization produces fast code, but it comes at the
 cost of compile time and binary size. [MIR
 optimizations](../mir/optimizations.md) can help a bit with this. Another
 optimization currently under development is called _polymorphization_.