diff options
| author | bors <bors@rust-lang.org> | 2014-05-31 01:06:40 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-31 01:06:40 -0700 |
| commit | faa7ba75a71b47151ed9b8c299d3fcc9af4207b5 (patch) | |
| tree | be5729412c9921961cdd4bc35c59107c6475acf1 /src/doc/rust.md | |
| parent | 92c43dba501be7df23a38842de2b12212212f49f (diff) | |
| parent | 1959925e514d9ecd5149435a3530dbdf0191f117 (diff) | |
| download | rust-faa7ba75a71b47151ed9b8c299d3fcc9af4207b5.tar.gz rust-faa7ba75a71b47151ed9b8c299d3fcc9af4207b5.zip | |
auto merge of #14553 : reem/rust/nuke-owned-vectors, r=alexcrichton
I removed all remaining deprecated owned vectors from the docs. All example tests pass.
Diffstat (limited to 'src/doc/rust.md')
| -rw-r--r-- | src/doc/rust.md | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md index ee37cd2126c..cde26bd8813 100644 --- a/src/doc/rust.md +++ b/src/doc/rust.md @@ -886,8 +886,8 @@ fn main() { // Equivalent to 'std::iter::range_step(0, 10, 2);' range_step(0, 10, 2); - // Equivalent to 'foo(~[std::option::Some(1.0), std::option::None]);' - foo(~[Some(1.0), None]); + // Equivalent to 'foo(vec![std::option::Some(1.0), std::option::None]);' + foo(vec![Some(1.0), None]); } ~~~~ @@ -995,8 +995,8 @@ the function name. fn iter<T>(seq: &[T], f: |T|) { for elt in seq.iter() { f(elt); } } -fn map<T, U>(seq: &[T], f: |T| -> U) -> ~[U] { - let mut acc = ~[]; +fn map<T, U>(seq: &[T], f: |T| -> U) -> Vec<U> { + let mut acc = vec![]; for elt in seq.iter() { acc.push(f(elt)); } acc } @@ -1159,10 +1159,10 @@ except that they have the `extern` modifier. ~~~~ // Declares an extern fn, the ABI defaults to "C" -extern fn new_vec() -> ~[int] { ~[] } +extern fn new_int() -> int { 0 } // Declares an extern fn with "stdcall" ABI -extern "stdcall" fn new_vec_stdcall() -> ~[int] { ~[] } +extern "stdcall" fn new_int_stdcall() -> int { 0 } ~~~~ Unlike normal functions, extern fns have an `extern "ABI" fn()`. @@ -1170,8 +1170,8 @@ This is the same type as the functions declared in an extern block. ~~~~ -# extern fn new_vec() -> ~[int] { ~[] } -let fptr: extern "C" fn() -> ~[int] = new_vec; +# extern fn new_int() -> int { 0 } +let fptr: extern "C" fn() -> int = new_int; ~~~~ Extern functions may be called directly from Rust code as Rust uses large, @@ -1509,7 +1509,7 @@ Implementation parameters are written after the `impl` keyword. ~~~~ # trait Seq<T> { } -impl<T> Seq<T> for ~[T] { +impl<T> Seq<T> for Vec<T> { /* ... */ } impl Seq<bool> for u32 { @@ -3347,7 +3347,7 @@ Such a definite-sized vector type is a first-class type, since its size is known A vector without such a size is said to be of _indefinite_ size, and is therefore not a _first-class_ type. An indefinite-size vector can only be instantiated through a pointer type, -such as `&[T]` or `~[T]`. +such as `&[T]` or `Vec<T>`. The kind of a vector type depends on the kind of its element type, as with other simple structural types. |
