Very minor grammatical fixes.

This commit is contained in:
Alexander Regueiro 2018-02-04 21:24:50 +00:00 committed by Who? Me?!
parent 7c158a6acc
commit 152c08b1c9
2 changed files with 6 additions and 6 deletions

View File

@ -135,7 +135,7 @@ a safe approximation, so that is what you get back.
You can also find various common types in the `tcx` itself by accessing You can also find various common types in the `tcx` itself by accessing
`tcx.types.bool`, `tcx.types.char`, etc (see `CommonTypes` for more). `tcx.types.bool`, `tcx.types.char`, etc (see `CommonTypes` for more).
### Beyond types: Other kinds of arena-allocated data structures ### Beyond types: other kinds of arena-allocated data structures
In addition to types, there are a number of other arena-allocated data In addition to types, there are a number of other arena-allocated data
structures that you can allocate, and which are found in this structures that you can allocate, and which are found in this

View File

@ -9,10 +9,10 @@ and higher-ranked types.
We use the notation `?T` to refer to inference variables, also called We use the notation `?T` to refer to inference variables, also called
existential variables. existential variables.
We use the term "region" and "lifetime" interchangeably. Both refer to We use the terms "region" and "lifetime" interchangeably. Both refer to
the `'a` in `&'a T`. the `'a` in `&'a T`.
The term "bound region" refers to regions bound in a function The term "bound region" refers to a region bound in a function
signature, such as the `'a` in `for<'a> fn(&'a u32)`. A region is signature, such as the `'a` in `for<'a> fn(&'a u32)`. A region is
"free" if it is not bound. "free" if it is not bound.
@ -158,7 +158,7 @@ is to first "generalize" `&'a i32` into a type with a region variable:
relate this new variable with the original bound: relate this new variable with the original bound:
&'?b i32 <: &'a i32 &'?b i32 <: &'a i32
This will result in a region constraint (see below) of `'?b: 'a`. This will result in a region constraint (see below) of `'?b: 'a`.
One final interesting case is relating two unbound type variables, One final interesting case is relating two unbound type variables,
@ -175,7 +175,7 @@ make (almost) no attempt to solve regions. These constraints have the
form of an outlives constraint: form of an outlives constraint:
'a: 'b 'a: 'b
Actually the code tends to view them as a subregion relation, but it's the same Actually the code tends to view them as a subregion relation, but it's the same
idea: idea:
@ -188,7 +188,7 @@ There is one case where we do some amount of eager unification. If you have an e
between two regions between two regions
'a = 'b 'a = 'b
we will record that fact in a unification table. You can then use we will record that fact in a unification table. You can then use
`opportunistic_resolve_var` to convert `'b` to `'a` (or vice `opportunistic_resolve_var` to convert `'b` to `'a` (or vice
versa). This is sometimes needed to ensure termination of fixed-point versa). This is sometimes needed to ensure termination of fixed-point