diff options
| author | bors <bors@rust-lang.org> | 2014-06-16 08:16:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-16 08:16:49 +0000 |
| commit | 7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4 (patch) | |
| tree | 1ea55f8c25540e7339e27fe9dd79cadbc332634f /src/doc | |
| parent | 2ef910f71ab83761b1f5f9144621f246622e92d8 (diff) | |
| parent | 89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745 (diff) | |
| download | rust-7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4.tar.gz rust-7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4.zip | |
auto merge of #14900 : alexcrichton/rust/snapshots, r=huonw
Closes #14898 Closes #14918
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/tutorial.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md index 9322985a922..61c71b273cb 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -2518,8 +2518,8 @@ valid types: trait Foo {} trait Bar<T> {} -fn sendable_foo(f: Box<Foo:Send>) { /* ... */ } -fn shareable_bar<T: Share>(b: &Bar<T>: Share) { /* ... */ } +fn sendable_foo(f: Box<Foo + Send>) { /* ... */ } +fn shareable_bar<T: Share>(b: &Bar<T> + Share) { /* ... */ } ~~~ When no colon is specified (such as the type `~Foo`), it is inferred that the |