Skip to content

Commit 80830f8

Browse files
fhartwigsteveklabnik
authored andcommitted
---
yaml --- r: 209505 b: refs/heads/try c: 16b60cf h: refs/heads/master i: 209503: 6f2e3fe v: v3
1 parent f4d6aba commit 80830f8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: ff1dcba342442c211e021ef68c5153c710f1fe8e
5+
refs/heads/try: 16b60cf003cab3624c0b79acd9c5eedec6d1ed37
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/doc/trpl/concurrency.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ Here's the error:
176176
^~~~~~~~~~~~~
177177
```
178178

179-
You see, [`Mutex`](std/sync/struct.Mutex.html) has a
180-
[`lock`](http://doc.rust-lang.org/nightly/std/sync/struct.Mutex.html#method.lock)
179+
You see, [`Mutex`](../std/sync/struct.Mutex.html) has a
180+
[`lock`](../std/sync/struct.Mutex.html#method.lock)
181181
method which has this signature:
182182

183183
```ignore

branches/try/src/doc/trpl/error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,5 +297,5 @@ It's worth noting that you can only use `try!` from a function that returns a
297297
`Result`, which means that you cannot use `try!` inside of `main()`, because
298298
`main()` doesn't return anything.
299299

300-
`try!` makes use of [`From<Error>`](../std/convert/trait.From.hml) to determine
300+
`try!` makes use of [`From<Error>`](../std/convert/trait.From.html) to determine
301301
what to return in the error case.

branches/try/src/doc/trpl/macros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mind.
3333
You may have seen the `vec!` macro, used to initialize a [vector][] with any
3434
number of elements.
3535

36-
[vector]: arrays-vectors-and-slices.html
36+
[vector]: vectors.html
3737

3838
```rust
3939
let x: Vec<u32> = vec![1, 2, 3];

0 commit comments

Comments
 (0)