Skip to content

Commit b7679e2

Browse files
committed
---
yaml --- r: 39308 b: refs/heads/incoming c: 1ba9419 h: refs/heads/master v: v3
1 parent 36c1aeb commit b7679e2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: 3f78e0ecc03b9e0c7b46c64a4be69343c6a8888a
9+
refs/heads/incoming: 1ba9419e6c8ea85e2d9f132d45dda4acb9598e53
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ let stack_crayons: &str = "Almond, AntiqueBrass, Apricot";
14551455
let stack_crayons: &str = &"Aquamarine, Asparagus, AtomicTangerine";
14561456
14571457
// A local heap (managed) string
1458-
let local_crayons: @str = @"BananMania, Beaver, Bittersweet";
1458+
let local_crayons: @str = @"BananaMania, Beaver, Bittersweet";
14591459
14601460
// An exchange heap (owned) string
14611461
let exchange_crayons: ~str = ~"Black, BlizzardBlue, Blue";
@@ -2133,7 +2133,7 @@ let stacky: &Drawable = &new_circle() as &Drawable;
21332133
21342134
Method calls to trait types are _dynamically dispatched_. Since the
21352135
compiler doesn't know specifically which functions to call at compile
2136-
time it uses a lookup table (also known as a vtable or dictionary) to
2136+
time, it uses a lookup table (also known as a vtable or dictionary) to
21372137
select the method to call at runtime.
21382138

21392139
This usage of traits is similar to Java interfaces.
@@ -2402,7 +2402,7 @@ tutorials on individual topics.
24022402

24032403
There is further documentation on the [wiki], including articles about
24042404
[unit testing] in Rust, [documenting][rustdoc] and [packaging][cargo]
2405-
Rust code, and a discussion of the [attributes] used to apply metada
2405+
Rust code, and a discussion of the [attributes] used to apply metadata
24062406
to code.
24072407

24082408
[borrow]: tutorial-borrowed-ptr.html

0 commit comments

Comments
 (0)