Skip to content

Commit ed09a7c

Browse files
committed
Rollup merge of #24510 - fhartwig:broken-links, r=nikomatsakis
Fix broken links in various parts of the docs. I also found a dead link [here](http://doc.rust-lang.org/nightly/alloc/boxed/) (the first link on the page), but the chapter of the book that it used to point at seems to be gone, and I'm not sure what should happen to that link.
2 parents 0131143 + 6ac836f commit ed09a7c

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/doc/complement-design-faq.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Types which are [`Sync`][sync] are thread-safe when multiple shared
5656
references to them are used concurrently. Types which are not `Sync` are not
5757
thread-safe, and thus when used in a global require unsafe code to use.
5858

59-
[sync]: core/kinds/trait.Sync.html
59+
[sync]: core/marker/trait.Sync.html
6060

6161
### If mutable static items that implement `Sync` are safe, why is taking &mut SHARABLE unsafe?
6262

@@ -139,7 +139,7 @@ and explicitly calling the `clone` method. Making user-defined copy operators
139139
explicit surfaces the underlying complexity, forcing the developer to opt-in
140140
to potentially expensive operations.
141141

142-
[copy]: core/kinds/trait.Copy.html
142+
[copy]: core/marker/trait.Copy.html
143143
[clone]: core/clone/trait.Clone.html
144144

145145
## No move constructors

src/doc/trpl/closures.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@ you tons of control over what your code does, and closures are no different.
205205

206206
Rust's implementation of closures is a bit different than other languages. They
207207
are effectively syntax sugar for traits. You'll want to make sure to have read
208-
the [traits chapter][traits] before this one, as well as the chapter on [static
209-
and dynamic dispatch][dispatch], which talks about trait objects.
208+
the [traits chapter][traits] before this one, as well as the chapter on [trait
209+
objects][trait-objects].
210210

211211
[traits]: traits.html
212-
[dispatch]: static-and-dynamic-dispatch.html
212+
[trait-objects]: trait-objects.html
213213

214214
Got all that? Good.
215215

src/libcore/raw.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ impl<T> Clone for Slice<T> {
7171
/// The representation of a trait object like `&SomeTrait`.
7272
///
7373
/// This struct has the same layout as types like `&SomeTrait` and
74-
/// `Box<AnotherTrait>`. The [Static and Dynamic Dispatch chapter of the
74+
/// `Box<AnotherTrait>`. The [Trait Objects chapter of the
7575
/// Book][moreinfo] contains more details about the precise nature of
7676
/// these internals.
7777
///
78-
/// [moreinfo]: ../../book/static-and-dynamic-dispatch.html#representation
78+
/// [moreinfo]: ../../book/trait-objects.html#representation
7979
///
8080
/// `TraitObject` is guaranteed to match layouts, but it is not the
8181
/// type of trait objects (e.g. the fields are not directly accessible

src/libcore/result.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@
8686
//! useful value.
8787
//!
8888
//! Consider the `write_all` method defined for I/O types
89-
//! by the [`Write`](../io/trait.Write.html) trait:
89+
//! by the [`Write`](../../std/io/trait.Write.html) trait:
9090
//!
9191
//! ```
9292
//! use std::io;
9393
//!
94-
//! trait Writer {
94+
//! trait Write {
9595
//! fn write_all(&mut self, bytes: &[u8]) -> Result<(), io::Error>;
9696
//! }
9797
//! ```

src/librustc/plugin/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
//! #![plugin(myplugin)]
4848
//! ```
4949
//!
50-
//! See the [Plugins Chapter](../../book/plugins.html) of the book
50+
//! See the [Plugins Chapter](../../book/compiler-plugins.html) of the book
5151
//! for more examples.
5252
5353
pub use self::registry::Registry;

0 commit comments

Comments
 (0)