Skip to content

Commit b3bcbb1

Browse files
committed
Rollup merge of #24113 - mbrubeck:doc-edit, r=steveklabnik
* 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
2 parents 322e4a1 + 6e86c63 commit b3bcbb1

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/libcore/any.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ use marker::{Reflect, Sized};
8383
// Any trait
8484
///////////////////////////////////////////////////////////////////////////////
8585

86-
/// A type to emulate dynamic typing. See the [module-level documentation][mod] for more details.
86+
/// A type to emulate dynamic typing.
8787
///
8888
/// Every type with no non-`'static` references implements `Any`.
89+
/// See the [module-level documentation][mod] for more details.
8990
///
90-
/// [mod]: ../index.html
91+
/// [mod]: index.html
9192
#[stable(feature = "rust1", since = "1.0.0")]
9293
pub trait Any: Reflect + 'static {
9394
/// Get the `TypeId` of `self`

src/libstd/io/mod.rs

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

0 commit comments

Comments
 (0)