Skip to content

Commit 0002703

Browse files
committed
---
yaml --- r: 224418 b: refs/heads/beta c: bcee0a8 h: refs/heads/master v: v3
1 parent 193d224 commit 0002703

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 30584b06efd06899f3cb99cffeef5ac61913bf22
26+
refs/heads/beta: bcee0a83b8ffd02269bd7cfa23bc1fc760719393
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/doc/trpl/glossary.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ expression might perform actions other than simply returning a value.
4848

4949
### Expression-Oriented Language
5050

51-
In early programming languages [expressions] and [statements] were two separate
52-
syntactic categories: expressions had a value and statements did things.
53-
However, later languages blurred this distinction, allowing expressions to do
54-
things and statements to have a value. In an expression-oriented language,
55-
(nearly) every statement is an expression and therefore returns a value.
56-
Consequently these expression statements can themselves form part of larger
57-
expressions.
58-
59-
[expressions]: glossary.html#expression
60-
[statements]: glossary.html#statement
51+
In early programming languages [expressions][expression] and
52+
[statements][statement] were two separate syntactic categories: expressions had
53+
a value and statements did things. However, later languages blurred this
54+
distinction, allowing expressions to do things and statements to have a value.
55+
In an expression-oriented language, (nearly) every statement is an expression
56+
and therefore returns a value. Consequently these expression statements can
57+
themselves form part of larger expressions.
58+
59+
[expression]: glossary.html#expression
60+
[statement]: glossary.html#statement
6161

6262
### Statement
6363

branches/beta/src/doc/trpl/hello-world.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,13 @@ string to the screen. Easy enough!
111111

112112
[allocation]: the-stack-and-the-heap.html
113113

114-
Finally, the line ends with a semicolon (`;`). Rust is an ‘expression oriented’
115-
language, which means that most things are expressions, rather than statements.
116-
The `;` is used to indicate that this expression is over, and the next one is
117-
ready to begin. Most lines of Rust code end with a `;`.
114+
Finally, the line ends with a semicolon (`;`). Rust is an [‘expression oriented’
115+
language][expression-oriented language], which means that most things are
116+
expressions, rather than statements. The `;` is used to indicate that this
117+
expression is over, and the next one is ready to begin. Most lines of Rust code
118+
end with a `;`.
119+
120+
[expression-oriented language]: glossary.html#expression-oriented-language
118121

119122
Finally, actually compiling and running our program. We can compile with our
120123
compiler, `rustc`, by passing it the name of our source file:

0 commit comments

Comments
 (0)