diff options
| author | bors <bors@rust-lang.org> | 2015-03-21 05:25:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-21 05:25:21 +0000 |
| commit | ecf8c64e1b1b60f228f0c472c0b0dab4a5b5aa61 (patch) | |
| tree | 03752d10ba340b85b8720647c7919a97b21d694b /src/libserialize | |
| parent | e2fa53e593a854a609ae9efe5a1bbe15265f0a6f (diff) | |
| parent | 212e03181e422f569b6426bc08b713a9efc0d0eb (diff) | |
| download | rust-ecf8c64e1b1b60f228f0c472c0b0dab4a5b5aa61.tar.gz rust-ecf8c64e1b1b60f228f0c472c0b0dab4a5b5aa61.zip | |
Auto merge of #23470 - alexcrichton:less-prelude, r=aturon
This commit removes the reexports of `old_io` traits as well as `old_path` types and traits from the prelude. This functionality is now all deprecated and needs to be removed to make way for other functionality like `Seek` in the `std::io` module (currently reexported as `NewSeek` in the io prelude). Closes #23377 Closes #23378
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/json.rs | 1 | ||||
| -rw-r--r-- | src/libserialize/serialize.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 529ed8598b1..096c72e6af2 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -2622,6 +2622,7 @@ mod tests { use std::{i64, u64, f32, f64}; use std::collections::BTreeMap; use std::string; + use std::old_io::Writer; #[derive(RustcDecodable, Eq, PartialEq, Debug)] struct OptionData { diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs index 77e2da7ec79..71f9e01706d 100644 --- a/src/libserialize/serialize.rs +++ b/src/libserialize/serialize.rs @@ -15,7 +15,7 @@ Core encoding and decoding interfaces. */ #[allow(deprecated)] -use std::old_path; +use std::old_path::{self, GenericPath}; use std::path; use std::rc::Rc; use std::cell::{Cell, RefCell}; |
