summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorBarosl LEE <github@barosl.com>2015-01-21 02:16:49 +0900
committerBarosl LEE <github@barosl.com>2015-01-21 02:16:49 +0900
commit75efb228089c71eec4c7b57c531f860686086d7f (patch)
treea493fe5131517d7b00b14e7ddeca657b2c88f9eb /src/libstd
parent33ea0115743d9587e4aa16e461bf47b57cc0a134 (diff)
parente28da7ad4428ff9b377269676abe7f183f3f0182 (diff)
downloadrust-75efb228089c71eec4c7b57c531f860686086d7f.tar.gz
rust-75efb228089c71eec4c7b57c531f860686086d7f.zip
Rollup merge of #21359 - WiSaGaN:bugfix/fix_marker, r=alexcrichton
From std::markers to std::marker.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index ddb8129630f..648326eee99 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -18,7 +18,7 @@
 //!
 //! The [`ptr`](ptr/index.html) and [`mem`](mem/index.html)
 //! modules deal with unsafe pointers and memory manipulation.
-//! [`markers`](markers/index.html) defines the special built-in traits,
+//! [`marker`](marker/index.html) defines the special built-in traits,
 //! and [`raw`](raw/index.html) the runtime representation of Rust types.
 //! These are some of the lowest-level building blocks in Rust.
 //!