about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-12-01 19:01:41 -0500
committerSteve Klabnik <steve@steveklabnik.com>2015-12-01 19:01:41 -0500
commitf798f2507330d42dbf790697dd858006c772c9a0 (patch)
tree0caf272d80ecc7c7aaaa73a1f30107d8c4d053e1 /src
parent69b2fce7bb2283ceb950f786c15cbbcd50787c8e (diff)
parent53f026948a42439095e672a00101dfdbadfcf008 (diff)
downloadrust-f798f2507330d42dbf790697dd858006c772c9a0.tar.gz
rust-f798f2507330d42dbf790697dd858006c772c9a0.zip
Rollup merge of #30129 - tbu-:pr_doc_arrays_coerce, r=steveklabnik
Fixes #29993.
Diffstat (limited to 'src')
-rw-r--r--src/libstd/primitive_docs.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
index e0d2011b293..fd422d3b397 100644
--- a/src/libstd/primitive_docs.rs
+++ b/src/libstd/primitive_docs.rs
@@ -214,8 +214,8 @@ mod prim_pointer { }
 
 #[doc(primitive = "array")]
 //
-/// A fixed-size array, denoted `[T; N]`, for the element type, `T`, and
-/// the non-negative compile time constant size, `N`.
+/// A fixed-size array, denoted `[T; N]`, for the element type, `T`, and the
+/// non-negative compile time constant size, `N`.
 ///
 /// Arrays values are created either with an explicit expression that lists
 /// each element: `[x, y, z]` or a repeat expression: `[x; N]`. The repeat
@@ -223,8 +223,8 @@ mod prim_pointer { }
 ///
 /// The type `[T; N]` is `Copy` if `T: Copy`.
 ///
-/// Arrays of sizes from 0 to 32 (inclusive) implement the following traits
-/// if the element type allows it:
+/// Arrays of sizes from 0 to 32 (inclusive) implement the following traits if
+/// the element type allows it:
 ///
 /// - `Clone` (only if `T: Copy`)
 /// - `Debug`
@@ -235,8 +235,8 @@ mod prim_pointer { }
 /// - `Borrow`, `BorrowMut`
 /// - `Default`
 ///
-/// Arrays dereference to [slices (`[T]`)][slice], so their methods can be called
-/// on arrays.
+/// Arrays coerce to [slices (`[T]`)][slice], so their methods can be called on
+/// arrays.
 ///
 /// [slice]: primitive.slice.html
 ///