Skip to content

Commit 3e47b4f

Browse files
committed
Revert "docs: Call () 'unit' instead of 'nil'"
This reverts commit c8ee49a.
1 parent 83fdedd commit 3e47b4f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

doc/tutorial-ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ define a struct type with the same contents, and declare
246246
`gettimeofday` to take a pointer to such a struct.
247247

248248
The second argument to `gettimeofday` (the time zone) is not used by
249-
this program, so it simply declares it to be a pointer to the unit
249+
this program, so it simply declares it to be a pointer to the nil
250250
type. Since all null pointers have the same representation regardless of
251251
their referent type, this is safe.
252252

doc/tutorial.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,11 @@ are not semicolons in the blocks of the second snippet. This is
294294
important; the lack of a semicolon after the last statement in a
295295
braced block gives the whole block the value of that last expression.
296296

297-
Put another way, the semicolon in Rust *ignores the value of an
298-
expression*. Thus, if the branches of the `if` had looked like `{ 4; }`,
299-
the above example would simply assign `()` (unit or void) to
300-
`price`. But without the semicolon, each branch has a different value,
301-
and `price` gets the value of the branch that was taken.
297+
Put another way, the semicolon in Rust *ignores the value of an expression*.
298+
Thus, if the branches of the `if` had looked like `{ 4; }`, the above example
299+
would simply assign `()` (nil or void) to `price`. But without the semicolon, each
300+
branch has a different value, and `price` gets the value of the branch that
301+
was taken.
302302

303303
In short, everything that's not a declaration (`let` for variables,
304304
`fn` for functions, et cetera) is an expression, including function bodies.
@@ -839,7 +839,7 @@ fn point_from_direction(dir: Direction) -> Point {
839839
Tuples in Rust behave exactly like structs, except that their fields
840840
do not have names (and can thus not be accessed with dot notation).
841841
Tuples can have any arity except for 0 or 1 (though you may consider
842-
unit, `()`, as the empty tuple if you like).
842+
nil, `()`, as the empty tuple if you like).
843843

844844
~~~~
845845
let mytup: (int, int, float) = (10, 20, 30.0);
@@ -891,7 +891,7 @@ fn int_to_str(i: int) -> ~str {
891891
}
892892
~~~~
893893

894-
Functions that do not return a value are said to return unit, `()`,
894+
Functions that do not return a value are said to return nil, `()`,
895895
and both the return type and the return value may be omitted from
896896
the definition. The following two functions are equivalent.
897897

0 commit comments

Comments
 (0)