From 44fd335952d54eeaac586eee764d9c73830883a0 Mon Sep 17 00:00:00 2001 From: Oleg Date: Sat, 31 Jan 2015 10:21:47 +0300 Subject: [PATCH 1/2] Change std::io to std::old_io --- macros/src/named_entities.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros/src/named_entities.rs b/macros/src/named_entities.rs index f1780cb3..25448606 100644 --- a/macros/src/named_entities.rs +++ b/macros/src/named_entities.rs @@ -9,7 +9,7 @@ #![allow(unused_imports)] // for quotes -use std::io; +use std::old_io; use std::path; use std::str::FromStr; use serialize::json; @@ -101,7 +101,7 @@ pub fn expand(cx: &mut ExtCtxt, sp: Span, tt: &[TokenTree]) -> Box Date: Sat, 31 Jan 2015 10:34:24 +0300 Subject: [PATCH 2/2] Fix for current rust version (rustc 1.0.0-dev (1d00c545e 2015-01-30 19:56:34 +0000) --- macros/src/lib.rs | 1 - src/lib.rs | 2 +- src/serialize/mod.rs | 2 +- src/sink/owned_dom.rs | 3 ++- src/sink/rcdom.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/macros/src/lib.rs b/macros/src/lib.rs index c33d01cb..d68419d8 100644 --- a/macros/src/lib.rs +++ b/macros/src/lib.rs @@ -12,7 +12,6 @@ #![feature(plugin_registrar, quote, old_orphan_check)] #![deny(warnings)] -#![allow(unstable)] extern crate syntax; extern crate rustc; diff --git a/src/lib.rs b/src/lib.rs index 1417dccf..dd8e615e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,7 +12,7 @@ #![feature(plugin, old_impl_check, int_uint, box_syntax)] #![deny(warnings)] -#![allow(unused_parens, unstable)] +#![allow(unused_parens)] // Don't implicitly pull in things from std::* // This helps us make a C-friendly library. diff --git a/src/serialize/mod.rs b/src/serialize/mod.rs index a0d3fbe0..5d5cb9e8 100644 --- a/src/serialize/mod.rs +++ b/src/serialize/mod.rs @@ -9,7 +9,7 @@ use core::prelude::*; -use std::io::{Writer, IoResult}; +use std::old_io::{Writer, IoResult}; use core::default::Default; use collections::vec::Vec; diff --git a/src/sink/owned_dom.rs b/src/sink/owned_dom.rs index 4ea02fd8..8cff8b96 100644 --- a/src/sink/owned_dom.rs +++ b/src/sink/owned_dom.rs @@ -7,6 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![allow(unused_attributes)] #![experimental="This module uses unsafe code, has not been thoroughly \ audited, and the performance gains vs. RcDom have not \ been demonstrated"] @@ -37,7 +38,7 @@ use alloc::boxed::Box; use collections::vec::Vec; use collections::string::String; use std::string::CowString; -use std::io::{Writer, IoResult}; +use std::old_io::{Writer, IoResult}; use std::collections::HashSet; use std::ops::{Deref, DerefMut}; diff --git a/src/sink/rcdom.rs b/src/sink/rcdom.rs index 48f4104e..5465cc57 100644 --- a/src/sink/rcdom.rs +++ b/src/sink/rcdom.rs @@ -28,7 +28,7 @@ use alloc::rc::{Rc, Weak}; use collections::vec::Vec; use collections::string::String; use std::string::CowString; -use std::io::{Writer, IoResult}; +use std::old_io::{Writer, IoResult}; use std::ops::DerefMut; use string_cache::QualName;