Skip to content

Commit 59171f8

Browse files
committed
rollup merge of #24651: tamird/old-references
r? @alexcrichton
2 parents 1ec7ccb + 71bc70e commit 59171f8

File tree

22 files changed

+12
-1045
lines changed

22 files changed

+12
-1045
lines changed

src/libcollections/fmt.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@
260260
//! Example usage is:
261261
//!
262262
//! ```
263-
//! # #![feature(old_io)]
264263
//! # #![allow(unused_must_use)]
265264
//! use std::io::Write;
266265
//! let mut w = Vec::new();
@@ -288,7 +287,6 @@
288287
//! off, some example usage is:
289288
//!
290289
//! ```
291-
//! # #![feature(old_io)]
292290
//! use std::fmt;
293291
//! use std::io::{self, Write};
294292
//!

src/libserialize/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2059,7 +2059,7 @@ impl<T: Iterator<Item=char>> Builder<T> {
20592059
}
20602060
}
20612061

2062-
/// Decodes a json value from an `&mut old_io::Reader`
2062+
/// Decodes a json value from an `&mut io::Read`
20632063
pub fn from_reader(rdr: &mut Read) -> Result<Json, BuilderError> {
20642064
let mut contents = Vec::new();
20652065
match rdr.read_to_end(&mut contents) {

src/libstd/panicking.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use rt::{backtrace, unwind};
1919
use sys::stdio::Stderr;
2020
use thread;
2121

22-
// Defined in this module instead of old_io::stdio so that the unwinding
2322
thread_local! {
2423
pub static LOCAL_STDERR: RefCell<Option<Box<Write + Send>>> = {
2524
RefCell::new(None)

0 commit comments

Comments
 (0)