rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #24113 - mbrubeck:doc-edit, r=steveklabnik

Browse Source 
* Fix broken \"module-level documentation\" link on the [`trait Any` docs](http://doc.rust-lang.org/std/any/trait.Any.html) and related broken markup on the [`std::any` docs](http://doc.rust-lang.org/std/any/index.html).

* Remove an outdated or incorrect notice in the `BufRead::lines` docs. There is no such `read_string` function, and `lines` never returns an error.

r? @steveklabnik
This commit is contained in:
Manish Goregaokar
2015-04-07 18:13:24 +05:30
parent 322e4a18e3 6e86c636e5
commit b3bcbb1a22
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcore/any.rs
View File

@@ -83,11 +83,12 @@ use marker::{Reflect, Sized};
// Any trait // Any trait
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// A type to emulate dynamic typing. See the [module-level documentation][mod] for more details. /// A type to emulate dynamic typing.
/// ///
/// Every type with no non-`'static` references implements `Any`. /// Every type with no non-`'static` references implements `Any`.
/// See the [module-level documentation][mod] for more details.
/// ///
/// [mod]: ../index.html /// [mod]: index.html
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub trait Any: Reflect + 'static { pub trait Any: Reflect + 'static {
/// Get the `TypeId` of `self` /// Get the `TypeId` of `self`

3
src/libstd/io/mod.rs
View File

@@ -618,9 +618,6 @@ pub trait BufRead: Read {
/// The iterator returned from this function will yield instances of /// The iterator returned from this function will yield instances of
/// `io::Result<String>`. Each string returned will *not* have a newline /// `io::Result<String>`. Each string returned will *not* have a newline
/// byte (the 0xA byte) at the end. /// byte (the 0xA byte) at the end.
///
/// This function will yield errors whenever `read_string` would have also
/// yielded an error.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
fn lines(self) -> Lines<Self> where Self: Sized { fn lines(self) -> Lines<Self> where Self: Sized {
Lines { buf: self } Lines { buf: self }