diff options
| author | bors <bors@rust-lang.org> | 2014-05-11 14:51:46 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-11 14:51:46 -0700 |
| commit | f483aa3a91ff9baf290ddf22209b984ec1f74b0c (patch) | |
| tree | 5fb01256f8e39c85a9871cee26fa4aa1392ba46d | |
| parent | 20356e4cc3f73648807dc56827102fbaff9061c6 (diff) | |
| parent | 1895ad269ca7d4c8a258fb6188fac5f1d97c55ff (diff) | |
| download | rust-f483aa3a91ff9baf290ddf22209b984ec1f74b0c.tar.gz rust-f483aa3a91ff9baf290ddf22209b984ec1f74b0c.zip | |
auto merge of #14102 : moonglum/rust/slice-clarification-in-readme, r=kballard
There are no arrays in Rust, they are slices. Especially in the tutorial beginners should not be confused with wrong terminology. It helps to know the right names for things when you want to find something in the documentation. @erickt explained that today to me and it helped me a lot when getting started :wink: Maybe we should also explain what a slice and what a vector is in the tutorial. If you like that, I will try to do that and attach that to the pull request :wink:
| -rw-r--r-- | src/doc/tutorial.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md index 9b9153fe579..b7122944ced 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -2385,7 +2385,7 @@ fn print_all<T: Printable>(printable_things: ~[T]) { Declaring `T` as conforming to the `Printable` trait (as we earlier did with `Clone`) makes it possible to call methods from that trait on values of type `T` inside the function. It will also cause a -compile-time error when anyone tries to call `print_all` on an array +compile-time error when anyone tries to call `print_all` on a vector whose element type does not have a `Printable` implementation. Type parameters can have multiple bounds by separating them with `+`, @@ -2428,9 +2428,9 @@ fn draw_all<T: Drawable>(shapes: ~[T]) { # draw_all(~[c]); ~~~~ -You can call that on an array of circles, or an array of rectangles +You can call that on a vector of circles, or a vector of rectangles (assuming those have suitable `Drawable` traits defined), but not on -an array containing both circles and rectangles. When such behavior is +a vector containing both circles and rectangles. When such behavior is needed, a trait name can alternately be used as a type, called an _object_. |
