Skip to content

Commit 7d7d917

Browse files
alexregmark-i-m
authored andcommitted
Changed all instances of e.g., to e.g., and similar.
1 parent 1a399f5 commit 7d7d917

8 files changed

+12
-12
lines changed

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ These are the policies for upholding our community's standards of conduct. If yo
2323
1. Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
2424
2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
2525
3. Moderators will first respond to such remarks with a warning.
26-
4. If the warning is unheeded, the user will be "kicked," i.e., kicked out of the communication channel to cool off.
27-
5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
26+
4. If the warning is unheeded, the user will be "kicked," i.e. kicked out of the communication channel to cool off.
27+
5. If the user comes back and continues to make trouble, they will be banned, i.e. indefinitely excluded.
2828
6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
2929
7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, **in private**. Complaints about bans in-channel are not allowed.
3030
8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.

src/glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ provider | the function that executes a query ([see more](query.
2525
sess | the compiler session, which stores global data used throughout compilation
2626
side tables | because the AST and HIR are immutable once created, we often carry extra information about them in the form of hashtables, indexed by the id of a particular node.
2727
span | a location in the user's source code, used for error reporting primarily. These are like a file-name/line-number/column tuple on steroids: they carry a start/end point, and also track macro expansions and compiler desugaring. All while being packed into a few bytes (really, it's an index into a table). See the Span datatype for more.
28-
substs | the substitutions for a given generic type or item (e.g., the `i32`, `u32` in `HashMap<i32, u32>`)
28+
substs | the substitutions for a given generic type or item (e.g. the `i32`, `u32` in `HashMap<i32, u32>`)
2929
tcx | the "typing context", main data structure of the compiler ([see more](ty.html))
3030
'tcx | the lifetime of the currently active inference context ([see more](ty.html))
3131
trans | the code to translate MIR into LLVM IR.

src/high-level-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ more and more to the [query model], however, the
4848

4949
At the other extreme, the `rustc` crate defines the common and
5050
pervasive data structures that all the rest of the compiler uses
51-
(e.g., how to represent types, traits, and the program itself). It
51+
(e.g. how to represent types, traits, and the program itself). It
5252
also contains some amount of the compiler itself, although that is
5353
relatively limited.
5454

@@ -77,8 +77,8 @@ purely "pass-based" compiler, where we ran a number of passes over the
7777
entire program, and each did a particular check of transformation. We
7878
are gradually replacing this pass-based code with an alternative setup
7979
based on on-demand **queries**. In the query-model, we work backwards,
80-
executing a *query* that expresses our ultimate goal (e.g., "compile
81-
this crate"). This query in turn may make other queries (e.g., "get me
80+
executing a *query* that expresses our ultimate goal (e.g. "compile
81+
this crate"). This query in turn may make other queries (e.g. "get me
8282
a list of all modules in the crate"). Those queries make other queries
8383
that ultimately bottom out in the base operations, like parsing the
8484
input, running the type-checker, and so forth. This on-demand model

src/hir.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data structure basically just contains the root module, the HIR
1818
`Crate` structure contains a number of maps and other things that
1919
serve to organize the content of the crate for easier access.
2020

21-
For example, the contents of individual items (e.g., modules,
21+
For example, the contents of individual items (e.g. modules,
2222
functions, traits, impls, etc) in the HIR are not immediately
2323
accessible in the parents. So, for example, if there is a module item
2424
`foo` containing a function `bar()`:

src/macro-expansion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ macro_rules! printer {
3030
`$mvar` is called a _metavariable_. Unlike normal variables, rather than
3131
binding to a value in a computation, a metavariable binds _at compile time_ to
3232
a tree of _tokens_. A _token_ is a single "unit" of the grammar, such as an
33-
identifier (e.g., `foo`) or punctuation (e.g., `=>`). There are also other
33+
identifier (e.g. `foo`) or punctuation (e.g. `=>`). There are also other
3434
special tokens, such as `EOF`, which indicates that there are no more tokens.
3535
Token trees resulting from paired parentheses-like characters (`(`...`)`,
3636
`[`...`]`, and `{`...`}`) – they include the open and close and all the tokens

src/query.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ will in turn demand information about that crate, starting from the
2525
*end*. For example:
2626

2727
- This "compile" query might demand to get a list of codegen-units
28-
(i.e., modules that need to be compiled by LLVM).
28+
(i.e. modules that need to be compiled by LLVM).
2929
- But computing the list of codegen-units would invoke some subquery
3030
that returns the list of all modules defined in the Rust source.
3131
- That query in turn would invoke something asking for the HIR.
@@ -134,7 +134,7 @@ fn provider<'cx, 'tcx>(tcx: TyCtxt<'cx, 'tcx, 'tcx>,
134134
```
135135

136136
Providers take two arguments: the `tcx` and the query key. Note also
137-
that they take the *global* tcx (i.e., they use the `'tcx` lifetime
137+
that they take the *global* tcx (i.e. they use the `'tcx` lifetime
138138
twice), rather than taking a tcx with some active inference context.
139139
They return the result of the query.
140140

src/trait-resolution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ if we had a trait reference `usize : Foo<$1>`, where `$n` is an unbound
408408
inference variable, we might replace it with `usize : Foo<%0>`, where
409409
`%n` is a skolemized type. We would then look this up in the cache.
410410
If we found a hit, the hit would tell us the immediate next step to
411-
take in the selection process: i.e., apply impl #22, or apply where
411+
take in the selection process: i.e. apply impl #22, or apply where
412412
clause `X : Foo<Y>`. Let's say in this case there is no hit.
413413
Therefore, we search through impls and where clauses and so forth, and
414414
we come to the conclusion that the only possible impl is this one,

src/type-inference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ method, roughly like so:
9090
infcx.at(...).eq(t, u);
9191
```
9292

93-
The first `at()` call provides a bit of context, i.e., why you are
93+
The first `at()` call provides a bit of context, i.e. why you are
9494
doing this unification, and in what environment, and the `eq` method
9595
performs the actual equality constraint.
9696

0 commit comments

Comments
 (0)