Skip to content

Commit 4ee7047

Browse files
committed
reference: miscellaneous fixes
1 parent 26f0cd5 commit 4ee7047

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/doc/reference.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,10 @@ The type of an _unsuffixed_ integer literal is determined by type inference:
343343
* If an integer type can be _uniquely_ determined from the surrounding
344344
program context, the unsuffixed integer literal has that type.
345345

346-
* If the program context underconstrains the type, it defaults to the
346+
* If the program context under-constrains the type, it defaults to the
347347
signed 32-bit integer `i32`.
348348

349-
* If the program context overconstrains the type, it is considered a
349+
* If the program context over-constrains the type, it is considered a
350350
static type error.
351351

352352
Examples of integer literals of various forms:
@@ -382,9 +382,9 @@ type inference:
382382
surrounding program context, the unsuffixed floating-point literal
383383
has that type.
384384

385-
* If the program context underconstrains the type, it defaults to `f64`.
385+
* If the program context under-constrains the type, it defaults to `f64`.
386386

387-
* If the program context overconstrains the type, it is considered a
387+
* If the program context over-constrains the type, it is considered a
388388
static type error.
389389

390390
Examples of floating-point literals of various forms:
@@ -1292,7 +1292,7 @@ All access to a static is safe, but there are a number of restrictions on
12921292
statics:
12931293

12941294
* Statics may not contain any destructors.
1295-
* The types of static values must ascribe to `Sync` to allow threadsafe access.
1295+
* The types of static values must ascribe to `Sync` to allow thread-safe access.
12961296
* Statics may not refer to other statics by value, only by reference.
12971297
* Constants cannot refer to statics.
12981298

@@ -1694,7 +1694,7 @@ explain, here's a few use cases and what they would entail:
16941694
* A crate needs a global available "helper module" to itself, but it doesn't
16951695
want to expose the helper module as a public API. To accomplish this, the
16961696
root of the crate's hierarchy would have a private module which then
1697-
internally has a "public api". Because the entire crate is a descendant of
1697+
internally has a "public API". Because the entire crate is a descendant of
16981698
the root, then the entire local crate can access this private module through
16991699
the second case.
17001700

@@ -3964,7 +3964,7 @@ In general, `--crate-type=bin` or `--crate-type=lib` should be sufficient for
39643964
all compilation needs, and the other options are just available if more
39653965
fine-grained control is desired over the output format of a Rust crate.
39663966

3967-
# Appendix: Rationales and design tradeoffs
3967+
# Appendix: Rationales and design trade-offs
39683968

39693969
*TODO*.
39703970

@@ -3974,7 +3974,7 @@ Rust is not a particularly original language, with design elements coming from
39743974
a wide range of sources. Some of these are listed below (including elements
39753975
that have since been removed):
39763976

3977-
* SML, OCaml: algebraic datatypes, pattern matching, type inference,
3977+
* SML, OCaml: algebraic data types, pattern matching, type inference,
39783978
semicolon statement separation
39793979
* C++: references, RAII, smart pointers, move semantics, monomorphisation,
39803980
memory model

0 commit comments

Comments
 (0)