Skip to content

Commit 31fbfc3

Browse files
committed
rollup merge of #23736: gmjosack/master
Found a few 404s that seemed like simple fixes: In footer.inc, certain 404 pages were 404ing on the request to jquery.js and playpen.js. This is easily demonstrated by visiting http://doc.rust-lang.org/foo then http://doc.rust-lang.org/foo/bar. The latter 404s, looking for foo/jquery.js. The Result docs use old_io Writer as an example. Fix the link to old_io Writer. There's probably an effort to update the example away from a deprecated api but this was a simple fix. rustc/plugin was pointing at the old guide and it was a broken link anyways (plugin vs plugins). Point at the book instead. The main page of the API docs referenced c_{str,vec}. Looks like these were deleted in 25d5a3a. Point at ffi docs instead.
2 parents 39fecde + 5123bf4 commit 31fbfc3

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/libcore/result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
//! useful value.
9393
//!
9494
//! Consider the `write_line` method defined for I/O types
95-
//! by the [`Writer`](../io/trait.Writer.html) trait:
95+
//! by the [`Writer`](../old_io/trait.Writer.html) trait:
9696
//!
9797
//! ```
9898
//! # #![feature(old_io)]

src/librustc/plugin/mod.rs

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

src/libstd/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@
6767
//! module encapsulates the platform-specific rules for dealing
6868
//! with file paths.
6969
//!
70-
//! `std` also includes modules for interoperating with the
71-
//! C language: [`c_str`](c_str/index.html) and
72-
//! [`c_vec`](c_vec/index.html).
70+
//! `std` also includes the [`ffi`](ffi/index.html) module for interoperating
71+
//! with the C language.
7372
//!
7473
//! ## Concurrency, I/O, and the runtime
7574
//!

0 commit comments

Comments
 (0)