Skip to content

Commit a2c4470

Browse files
committed
---
yaml --- r: 14296 b: refs/heads/try c: 6d1d9a0 h: refs/heads/master v: v3
1 parent cc050bf commit a2c4470

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: d5e7f0d1134c41757901ccb9e944974042ee3d93
5+
refs/heads/try: 6d1d9a0236babce7ed748dfb221a2240fcee42b4
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/doc/rust.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ accessed through the components `x` and `y`, and laid out in memory with the
10321032
An _enumeration item_ simultaneously declares a new nominal
10331033
[enumerated type](#enumerated-types) as well as a set of *constructors* that
10341034
can be used to create or pattern-match values of the corresponding enumerated
1035-
type. Note that `enum` previously was refered to as a `tag`, however this
1035+
type. Note that `enum` previously was referred to as a `tag`, however this
10361036
definition has been deprecated. While `tag` is no longer used, the two are
10371037
synonymous.
10381038

@@ -1622,7 +1622,7 @@ fn avg(v: [float]) -> float {
16221622
~~~~
16231623

16241624
A cast is a *trivial cast* iff the type of the casted expression and the
1625-
target type are identical after replacing all occurences of `int`, `uint`,
1625+
target type are identical after replacing all occurrences of `int`, `uint`,
16261626
`float` with their machine type equivalents of the target architecture in both
16271627
types.
16281628

@@ -3131,7 +3131,7 @@ state. In this state it executes the statements of its entry function, and any
31313131
functions called by the entry function.
31323132

31333133
A task may transition from the *running* state to the *blocked* state any time
3134-
it makes a blocking recieve call on a port, or attempts a rate-limited
3134+
it makes a blocking receive call on a port, or attempts a rate-limited
31353135
blocking send on a channel. When the communication expression can be completed
31363136
-- when a message arrives at a sender, or a queue drains sufficiently to
31373137
complete a rate-limited send -- then the blocked task will unblock and
@@ -3302,7 +3302,7 @@ As an example, to see all the logs generated by the compiler, you would set
33023302
you would set it to `rustc::metadata::creader`. To see just error logging
33033303
use `rustc=0`.
33043304

3305-
Note that when compiling either `.rs` or `.rc` files that don't specifiy a
3305+
Note that when compiling either `.rs` or `.rc` files that don't specify a
33063306
crate name the crate is given a default name that matches the source file,
33073307
with the extension removed. In that case, to turn on logging for a program
33083308
compiled from, e.g. `helloworld.rs`, `RUST_LOG` should be set to `helloworld`.
@@ -3390,7 +3390,7 @@ have come and gone during the course of Rust's development:
33903390

33913391
* The Newsqueak (1988), Alef (1995), and Limbo (1996) family. These
33923392
languages were developed by Rob Pike, Phil Winterbottom, Sean Dorward and
3393-
others in their group at Bell labs Computing Sciences Reserch Center
3393+
others in their group at Bell labs Computing Sciences Research Center
33943394
(Murray Hill, NJ, USA).
33953395

33963396
* The Napier (1985) and Napier88 (1988) family. These languages were

0 commit comments

Comments
 (0)