about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2018-11-05 07:52:09 +0100
committerWho? Me?! <mark-i-m@users.noreply.github.com>2018-11-09 19:17:49 -0600
commit4bc2711dd267251c752119f278eb71ab2f06f137 (patch)
tree566072ebb60312891ac5c2a30a8d27e8afd8e108 /src/doc/rustc-dev-guide
parent2a235197be99c9ba24e1da7f0e02ca8d911a4d6a (diff)
downloadrust-4bc2711dd267251c752119f278eb71ab2f06f137.tar.gz
rust-4bc2711dd267251c752119f278eb71ab2f06f137.zip
Address most other review comments
Diffstat (limited to 'src/doc/rustc-dev-guide')
-rw-r--r--src/doc/rustc-dev-guide/src/mir/construction.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/doc/rustc-dev-guide/src/mir/construction.md b/src/doc/rustc-dev-guide/src/mir/construction.md
index 3e300d43dd9..b7bd6bec6a0 100644
--- a/src/doc/rustc-dev-guide/src/mir/construction.md
+++ b/src/doc/rustc-dev-guide/src/mir/construction.md
@@ -14,16 +14,16 @@ list of items:
 The lowering is triggered by calling the [`mir_built`] query.
 There is an intermediate representation
 between [HIR] and [MIR] called the [HAIR] that is only used during the lowering.
-The [HAIR]'s most important feature is that the various adjustments that happen
-without explicit syntax (coercion, autoderef, autoref, ...) have become explicit
-casts, deref operations or reference expressions.
+The [HAIR]'s most important feature is that the various adjustments (which happen
+without explicit syntax) like coercions, autoderef, autoref and overloaded method
+calls have become explicit casts, deref operations, reference expressions or
+concrete function calls.
 
 The [HAIR] has datatypes that mirror the [HIR] datatypes, but instead of e.g. `-x`
 being a `hair::ExprKind::Neg(hair::Expr)` it is a `hair::ExprKind::Neg(hir::Expr)`.
 This shallowness enables the `HAIR` to represent all datatypes that [HIR] has, but
-without having to create an in-memory copy of the entire [HIR]. The [HAIR] also
-does a few simplifications, e.g. method calls and function calls have been merged
-into a single variant. [MIR] lowering will first convert the topmost expression from
+without having to create an in-memory copy of the entire [HIR].
+[MIR] lowering will first convert the topmost expression from
 [HIR] to [HAIR] (in
 [https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/hair/cx/expr/index.html])
 and then process the [HAIR] expressions recursively.
@@ -85,7 +85,7 @@ basic block onto which the statements should be appended.
 
 ## Lowering expressions into the desired MIR
 
-There are essentially four kinds of representations one might want of a value:
+There are essentially four kinds of representations one might want of an expression:
 
 * `Place` refers to a (or a part of) preexisting memory location (local, static, promoted)
 * `Rvalue` is something that can be assigned to a `Place`