about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Burka <durka42+github@gmail.com>2016-01-26 14:36:48 -0500
committerAlex Burka <durka42+github@gmail.com>2016-01-26 14:36:48 -0500
commit2f633b2204a16b5f21326c9f8d676b10862f1254 (patch)
tree1f03852e6b72fd58782ea15ad90094f790d4e163
parent638555e64d0fc66adc30bc57add2fe6f9164483c (diff)
downloadrust-2f633b2204a16b5f21326c9f8d676b10862f1254.tar.gz
rust-2f633b2204a16b5f21326c9f8d676b10862f1254.zip
capitalization and associated types
-rw-r--r--src/doc/book/syntax-index.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/doc/book/syntax-index.md b/src/doc/book/syntax-index.md
index c2891704352..3fa587ba085 100644
--- a/src/doc/book/syntax-index.md
+++ b/src/doc/book/syntax-index.md
@@ -2,7 +2,7 @@
 
 ## Keywords
 
-* `as`: primitive casting, or part of UFCS.  See [Casting Between Types (`as`)], [Universal Function Call Syntax (Angle-bracket Form)].
+* `as`: primitive casting, or disambiguating the specific trait containing an item.  See [Casting Between Types (`as`)], [Universal Function Call Syntax (Angle-bracket Form)], [Associated Types].
 * `break`: break out of loop.  See [Loops (Ending Iteration Early)].
 * `const`: constant items and constant raw pointers.  See [`const` and `static`], [Raw Pointers].
 * `continue`: continue to next loop iteration.  See [Loops (Ending Iteration Early)].
@@ -115,11 +115,11 @@
 * `::path`: path relative to the crate root (*i.e.* an explicitly absolute path).  See [Crates and Modules (Re-exporting with `pub use`)].
 * `self::path`: path relative to the current module (*i.e.* an explicitly relative path).  See [Crates and Modules (Re-exporting with `pub use`)].
 * `super::path`: path relative to the parent of the current module.  See [Crates and Modules (Re-exporting with `pub use`)].
-* `type::ident`: associated constants, functions, and types.  See [Associated Types].
+* `type::ident`, `<type as trait>::ident`: associated constants, functions, and types.  See [Associated Types].
 * `<type>::…`: associated item for a type which cannot be directly named (*e.g.* `<&T>::…`, `<[T]>::…`, *etc.*).  See [Associated Types].
-* `Trait::method(…)`: disambiguating a method call by naming the trait which defines it. See [Universal Function Call Syntax].
-* `Type::method(…)`: disambiguating a method call by naming the type for which it's defined. See [Universal Function Call Syntax].
-* `<Type as Trait>::method(…)`: disambiguating a method call by naming the trait _and_ type. See [Universal Function Call Syntax (Angle-bracket Form)].
+* `trait::method(…)`: disambiguating a method call by naming the trait which defines it. See [Universal Function Call Syntax].
+* `type::method(…)`: disambiguating a method call by naming the type for which it's defined. See [Universal Function Call Syntax].
+* `<type as trait>::method(…)`: disambiguating a method call by naming the trait _and_ type. See [Universal Function Call Syntax (Angle-bracket Form)].
 
 <!-- Generics -->