diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-12-13 18:22:09 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-12-15 06:44:20 -0800 |
| commit | 6c4a2bc55ffc4dcb64cab2e2772e012eb7a2c0c3 (patch) | |
| tree | e02199009fdcb5bc841f561c3cf29055c40ea81e /src/libstd | |
| parent | 34dfa7addb7cb57ef4f6e70f00fa8216c343104e (diff) | |
| parent | 6780031540a708282be6262f820078f8e8198611 (diff) | |
| download | rust-6c4a2bc55ffc4dcb64cab2e2772e012eb7a2c0c3.tar.gz rust-6c4a2bc55ffc4dcb64cab2e2772e012eb7a2c0c3.zip | |
rollup merge of #19710: steveklabnik/gh15449
Fixes #15499.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/buffered.rs | 6 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 2 | ||||
| -rw-r--r-- | src/libstd/os.rs | 4 | ||||
| -rw-r--r-- | src/libstd/task.rs | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index a8de7356fe7..a16b84d0c16 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -80,7 +80,7 @@ impl<R: Reader> BufferedReader<R> { /// Gets a mutable reference to the underlying reader. /// - /// ## Warning + /// # Warning /// /// It is inadvisable to directly read from the underlying reader. pub fn get_mut(&mut self) -> &mut R { &mut self.inner } @@ -185,7 +185,7 @@ impl<W: Writer> BufferedWriter<W> { /// Gets a mutable reference to the underlying write. /// - /// ## Warning + /// # Warning /// /// It is inadvisable to directly read from the underlying writer. pub fn get_mut(&mut self) -> &mut W { self.inner.as_mut().unwrap() } @@ -357,7 +357,7 @@ impl<S: Stream> BufferedStream<S> { /// Gets a mutable reference to the underlying stream. /// - /// ## Warning + /// # Warning /// /// It is inadvisable to read directly from or write directly to the /// underlying stream. diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 344012a09a0..53fac3fd3c9 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -127,7 +127,7 @@ impl StdinReader { /// /// This provides access to methods like `chars` and `lines`. /// - /// ## Example + /// # Examples /// /// ```rust /// use std::io; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index a3ecfb49ace..a8d854a7555 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -1237,7 +1237,7 @@ impl Copy for MapOption {} /// Possible errors when creating a map. pub enum MapError { - /// ## The following are POSIX-specific + /// # The following are POSIX-specific /// /// fd was not open for reading or, if using `MapWritable`, was not open for /// writing. @@ -1259,7 +1259,7 @@ pub enum MapError { ErrZeroLength, /// Unrecognized error. The inner value is the unrecognized errno. ErrUnknown(int), - /// ## The following are Windows-specific + /// # The following are Windows-specific /// /// Unsupported combination of protection flags /// (`MapReadable`/`MapWritable`/`MapExecutable`). diff --git a/src/libstd/task.rs b/src/libstd/task.rs index 340e283708a..562afd33e2f 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -32,7 +32,7 @@ //! the main task panics the application will exit with a non-zero //! exit code. //! -//! ## Example +//! # Examples //! //! ```rust //! spawn(move|| { |