---

yaml
---
r: 40946
b: refs/heads/dist-snap
c: e0f9f89
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 9cbc0fd0d9cee2f4138226c3bfd612788ddc5433
+refs/heads/dist-snap: e0f9f89c6575c79fc2afba6abf0c17c384c81e3b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/tutorial.md

@@ -308,46 +308,6 @@ fn is_four(x: int) -> bool {
 }
 ~~~~
 
-If all those things are expressions, you might conclude that you have
-to add a terminating semicolon after *every* statement, even ones that
-are not traditionally terminated with a semicolon in C (like `while`).
-That is not the case, though. Expressions that end in a block only
-need a semicolon if that block contains a trailing expression. `while`
-loops do not allow trailing expressions, and `if` statements tend to
-only have a trailing expression when you want to use their value for
-something—in which case you'll have embedded it in a bigger statement.
-
-~~~
-# fn foo() -> bool { true }
-# fn bar() -> bool { true }
-# fn baz() -> bool { true }
-// `let` is not an expression, so it is semicolon-terminated;
-let x = foo();
-
-// When used in statement position, bracy expressions do not
-// usually need to be semicolon terminated
-if x {
-    bar();
-} else {
-    baz();
-} // No semi-colon
-
-// Although, if `bar` and `baz` have non-nil return types, and
-// we try to use them as the tail expressions, rustc will
-// make us terminate the expression.
-if x {
-    bar()
-} else {
-    baz()
-}; // Semi-colon to ignore non-nil block type
-
-// An `if` embedded in `let` again requires a semicolon to terminate
-// the `let` statement
-let y = if x { foo() } else { bar() };
-~~~
-
-This may sound intricate, but it is super-useful and will grow on you.
-
 ## Types
 
 The basic types include the usual boolean, integral, and floating-point types.