Skip to content

Commit 3c0104d

Browse files
mbrubeckbrson
authored andcommitted
---
yaml --- r: 5840 b: refs/heads/master c: 9e8076c h: refs/heads/master v: v3
1 parent a2edb16 commit 3c0104d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: db84029268b9bbebe153d0a99920089126f79154
2+
refs/heads/master: 9e8076c88bdedd81a9dbd0492c6682cdc61d6e61

trunk/doc/rust.texi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@ were declared without the @code{!} annotation, the following code would not
18781878
typecheck:
18791879
@example
18801880
fn f(i: int) -> int @{
1881-
if (i == 42) @{
1881+
if i == 42 @{
18821882
ret 42;
18831883
@}
18841884
else @{
@@ -3056,7 +3056,7 @@ and transfers control to the caller frame.
30563056
An example of a @code{ret} expression:
30573057
@example
30583058
fn max(a: int, b: int) -> int @{
3059-
if (a > b) @{
3059+
if a > b @{
30603060
ret a;
30613061
@}
30623062
ret b;
@@ -3081,7 +3081,7 @@ last expression in a block.
30813081
An example of a @code{be} expression:
30823082
@example
30833083
fn print_loop(n: int) @{
3084-
if (n <= 0) @{
3084+
if n <= 0 @{
30853085
ret;
30863086
@} else @{
30873087
print_int(n);
@@ -3304,9 +3304,9 @@ for each s: str in str::split(txt, "\n") @{
33043304
@cindex Control-flow
33053305

33063306
An @code{if} expression is a conditional branch in program control. The form of
3307-
an @code{if} expression is a parenthesized condition expression, followed by a
3308-
consequent block, any number of @code{else if} conditions and blocks, and an
3309-
optional trailing @code{else} block. The condition expressions must have type
3307+
an @code{if} expression is a condition expression, followed by a consequent
3308+
block, any number of @code{else if} conditions and blocks, and an optional
3309+
trailing @code{else} block. The condition expressions must have type
33103310
@code{bool}. If a condition expression evaluates to @code{true}, the
33113311
consequent block is executed and any subsequent @code{else if} or @code{else}
33123312
block is skipped. If a condition expression evaluates to @code{false}, the

0 commit comments

Comments
 (0)