about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMatthijs van der Vleuten <git@zr40.nl>2014-02-12 13:11:12 +0100
committerMatthijs van der Vleuten <git@zr40.nl>2014-02-12 13:11:12 +0100
commit4f72c018cec120d596ece1b5f2a2e7d59f1ef520 (patch)
treed927543b77a7bda9de3ccf349fcf28daadf59bad /src
parent2ca02eae1cbd69d6dbf9fec04a043ead890a8db3 (diff)
downloadrust-4f72c018cec120d596ece1b5f2a2e7d59f1ef520.tar.gz
rust-4f72c018cec120d596ece1b5f2a2e7d59f1ef520.zip
doc: rename 'nil' to 'unit' when describing `()`
Diffstat (limited to 'src')
-rw-r--r--src/doc/tutorial.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md
index 91d5e490949..61eccb52055 100644
--- a/src/doc/tutorial.md
+++ b/src/doc/tutorial.md
@@ -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*.
 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
 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
 [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
 
@@ -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
 writing an explicit `return`. The utility of `return` comes in when
 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
 are equivalent.