aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLindsey Kuper <[email protected]>2011-04-15 17:15:31 -0700
committerGraydon Hoare <[email protected]>2011-04-18 11:49:32 -0700
commit0c873993c94a3bd5827061120e2caf230f89c498 (patch)
tree7409bdec87f3357ed167909e03e006d511445d2d
parentrustc: Create stub glue for structural comparison (diff)
downloadrust-0c873993c94a3bd5827061120e2caf230f89c498.tar.xz
rust-0c873993c94a3bd5827061120e2caf230f89c498.zip
'Type' renamed to 'type definition'.
This is basically so people don't confuse a Ref.Item.Type with a Ref.Type.
-rw-r--r--doc/rust.texi12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/rust.texi b/doc/rust.texi
index 23764f65..402478d8 100644
--- a/doc/rust.texi
+++ b/doc/rust.texi
@@ -1651,7 +1651,7 @@ compile-time, remain constant during execution, and may reside in read-only
memory.
There are five primary kinds of item: modules, functions, iterators, objects and
-types.
+type definitions.
All items form an implicit scope for the declaration of sub-items. In other
words, within a function, object or iterator, declarations of items can (in
@@ -1662,8 +1662,8 @@ the item's @emph{path name} within the module namespace is qualified by the
name of the enclosing item. The exact locations in which sub-items may be
declared is given by the grammar. @xref{Ref.Gram}.
-Functions, iterators, objects and types may be @emph{parametrized} by
-type. Type parameters are given as a comma-separated list of identifiers
+Functions, iterators, objects and type definitions may be @emph{parametrized}
+by type. Type parameters are given as a comma-separated list of identifiers
enclosed in square brackets (@code{[]}), after the name of the item and before
its definition. The type parameters of an item are part of the name, not the
type of the item; in order to refer to the type-parametrized item, a
@@ -1946,10 +1946,10 @@ variables to initial values.
@node Ref.Item.Type
@subsection Ref.Item.Type
@c * Ref.Item.Type:: Items defining the types of values and slots.
-@cindex Types
+@cindex Type definitions
-A @dfn{type} defines a set of possible values in
-memory. @xref{Ref.Type}. Types are declared with the keyword
+A @dfn{type definition} defines a set of possible values in
+memory. @xref{Ref.Type}. Type definitions are declared with the keyword
@code{type}. Every value has a single, specific type; the type-specified
aspects of a value include: