bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #12210 : zr40/rust/patch-1, r=cmr

Browse source 
According to kimundi on IRC, the current term for `()` is 'unit'. This commit updates tutorial.md to change 'nil' to 'unit' where `()` is described.
This commit is contained in:
bors 2014-02-13 10:32:18 -08:00
commit cfb87f10ec
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/doc/tutorial.md
View file

@ -293,7 +293,7 @@ braced block gives the whole block the value of that last expression.
Put another way, the semicolon in Rust *ignores the value of an expression*. Put another way, the semicolon in Rust *ignores the value of an expression*.
Thus, if the branches of the `if` had looked like `{ 4; }`, the above example Thus, if the branches of the `if` had looked like `{ 4; }`, the above example
would simply assign `()` (nil or void) to `price`. But without the semicolon, each would simply assign `()` (unit or void) to `price`. But without the semicolon, each
branch has a different value, and `price` gets the value of the branch that branch has a different value, and `price` gets the value of the branch that
was taken. was taken.
@ -352,7 +352,7 @@ before the opening and after the closing quote, and can contain any sequence of
characters except their closing delimiter. More on strings characters except their closing delimiter. More on strings
[later](#vectors-and-strings). [later](#vectors-and-strings).
The nil type, written `()`, has a single value, also written `()`. The unit type, written `()`, has a single value, also written `()`.
## Operators ## Operators
@ -852,7 +852,7 @@ fn line(a: int, b: int, x: int) -> int {
It's better Rust style to write a return value this way instead of It's better Rust style to write a return value this way instead of
writing an explicit `return`. The utility of `return` comes in when writing an explicit `return`. The utility of `return` comes in when
returning early from a function. Functions that do not return a value returning early from a function. Functions that do not return a value
are said to return nil, `()`, and both the return type and the return are said to return unit, `()`, and both the return type and the return
value may be omitted from the definition. The following two functions value may be omitted from the definition. The following two functions
are equivalent. are equivalent.