about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-22 09:05:29 +0000
committerbors <bors@rust-lang.org>2014-09-22 09:05:29 +0000
commit8a458181dd7fef8df0bb488eee2c354a8ca4df4a (patch)
tree49a6c4a4b86a658a498cd2845bcedc0db2ee4264 /src/libstd
parenteeda1b87ff9dd2902f6d58c83d384775b90e3734 (diff)
parenta0d502b0ed096397b7cccde37ec7139011ce7e9a (diff)
downloadrust-8a458181dd7fef8df0bb488eee2c354a8ca4df4a.tar.gz
rust-8a458181dd7fef8df0bb488eee2c354a8ca4df4a.zip
auto merge of #17339 : treeman/rust/doc-things, r=alexcrichton
Also some cleanup to conform to documentation style.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/bitflags.rs8
-rw-r--r--src/libstd/macros.rs4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/bitflags.rs b/src/libstd/bitflags.rs
index 41813fff36e..7855748fc64 100644
--- a/src/libstd/bitflags.rs
+++ b/src/libstd/bitflags.rs
@@ -21,7 +21,7 @@
 ///
 /// # Example
 ///
-/// ~~~rust
+/// ```{.rust}
 /// bitflags! {
 ///     flags Flags: u32 {
 ///         static FlagA       = 0x00000001,
@@ -41,11 +41,11 @@
 ///     assert!((e1 - e2) == FlagA);     // set difference
 ///     assert!(!e2 == FlagA);           // set complement
 /// }
-/// ~~~
+/// ```
 ///
 /// The generated `struct`s can also be extended with type and trait implementations:
 ///
-/// ~~~rust
+/// ```{.rust}
 /// use std::fmt;
 ///
 /// bitflags! {
@@ -74,7 +74,7 @@
 ///     assert!(flags.is_empty());
 ///     assert_eq!(format!("{}", flags).as_slice(), "hi!");
 /// }
-/// ~~~
+/// ```
 ///
 /// # Attributes
 ///
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 86c03708e40..d949a03dfc1 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -192,7 +192,7 @@ macro_rules! debug_assert_eq(
 ///
 /// # Example
 ///
-/// ~~~rust
+/// ```{.rust}
 /// struct Item { weight: uint }
 ///
 /// fn choose_weighted_item(v: &[Item]) -> Item {
@@ -208,7 +208,7 @@ macro_rules! debug_assert_eq(
 ///     // type checker that it isn't possible to get down here
 ///     unreachable!();
 /// }
-/// ~~~
+/// ```
 #[macro_export]
 macro_rules! unreachable(
     () => (fail!("internal error: entered unreachable code"))