Skip to content

Commit 7336639

Browse files
Alexander Regueiromark-i-m
authored andcommitted
Fixed issues mentioned by @mark-i-m in review.
1 parent 606e39a commit 7336639

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

src/SUMMARY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
- [MIR construction](./mir-construction.md)
2020
- [MIR borrowck](./mir-borrowck.md)
2121
- [MIR optimizations](./mir-optimizations.md)
22-
- [The `trans` crate: generating LLVM IR](./trans.md)
22+
- [Generating LLVM IR](./trans.md)
2323
- [Glossary](./glossary.md)

src/high-level-overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Rustc consists of a number of crates, including `syntax`,
1212
many more. The source for each crate can be found in a directory
1313
like `src/libXXX`, where `XXX` is the crate name.
1414

15-
(NB. The names and divisions of these crates are not set in
16-
stone and may change over time – for the time being, we tend towards
17-
a finer-grained division to help with compilation time, though as
18-
incremental improves that may change.)
15+
(N.B. The names and divisions of these crates are not set in
16+
stone and may change over time. For the time being, we tend towards a
17+
finer-grained division to help with compilation time, though as incremental
18+
compilation improves, that may change.)
1919

2020
The dependency structure of these crates is roughly a diamond:
2121

@@ -37,7 +37,7 @@ rustc_trans rustc_borrowck ... rustc_metadata
3737
/ \
3838
/ \
3939
syntax_pos syntax_ext
40-
```
40+
```
4141

4242
The `rustc_driver` crate, at the top of this lattice, is effectively
4343
the "main" function for the rust compiler. It doesn't have much "real
@@ -127,7 +127,7 @@ take:
127127
4. **Lowering to MIR and post-processing**
128128
- Once type-checking is done, we can lower the HIR into MIR ("middle IR"), which
129129
is a **very** desugared version of Rust, well suited to the borrowck but also
130-
certain high-level optimizations.
130+
certain high-level optimizations.
131131
5. **Translation to LLVM and LLVM optimizations**
132132
- From MIR, we can produce LLVM IR.
133133
- LLVM then runs its various optimizations, which produces a number of `.o` files

src/hir.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ sorts of identifiers in active use:
5959
- `DefId` – primarily names "definitions" or top-level items.
6060
- You can think of a `DefId` as shorthand for a very explicit and complete
6161
path, like `std::collections::HashMap`. However, these paths are able to
62-
name things that are not nameable in normal Rust (e.g. impls), and they also
63-
include extra information about the crate (such as its version number, since
64-
two versions of the same crate can co-exist).
62+
name things that are not nameable in normal Rust (e.g. `impl`s), and they
63+
also include extra information about the crate (such as its version number,
64+
since two versions of the same crate can co-exist).
6565
- A `DefId` really consists of two parts, a `CrateNum` (which identifies the
6666
crate) and a `DefIndex` (which indexes into a list of items that is
6767
maintained per crate).

src/trans.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# The `trans` crate: generating LLVM IR
1+
# Generating LLVM IR

src/type-inference.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Type inference
22

3-
The type inference is based on the standard HindleyMilner (HM) system,
4-
but extended in various way to accommodate subtyping, region inference,
5-
and higher-ranked types.
3+
The type inference is based on the standard Hindley-Milner (HM) type inference
4+
algorithm, but extended in various way to accommodate subtyping, region
5+
inference, and higher-ranked types.
66

77
## A note on terminology
88

@@ -12,7 +12,7 @@ existential variables.
1212
We use the terms "region" and "lifetime" interchangeably. Both refer to
1313
the `'a` in `&'a T`.
1414

15-
The term "bound region" refers to a region bound in a function
15+
The term "bound region" refers to a region that is a bound in a function
1616
signature, such as the `'a` in `for<'a> fn(&'a u32)`. A region is
1717
"free" if it is not bound.
1818

0 commit comments

Comments
 (0)