mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Upgrade to rustc ba2f13ef0 2015-02-04
This commit is contained in:
parent
bc6882bdef
commit
d5dd1d658e
136 changed files with 1091 additions and 878 deletions
|
@ -4,11 +4,10 @@
|
|||
|
||||
/// General actor system infrastructure.
|
||||
|
||||
use std::any::Any;
|
||||
use std::any::{Any, TypeId};
|
||||
use std::collections::HashMap;
|
||||
use std::cell::{Cell, RefCell};
|
||||
use std::intrinsics::TypeId;
|
||||
use std::io::TcpStream;
|
||||
use std::old_io::TcpStream;
|
||||
use std::mem::{replace, transmute};
|
||||
use std::raw::TraitObject;
|
||||
use serialize::json;
|
||||
|
|
|
@ -16,7 +16,7 @@ use msg::constellation_msg::PipelineId;
|
|||
use collections::BTreeMap;
|
||||
use core::cell::RefCell;
|
||||
use serialize::json::{self, Json, ToJson};
|
||||
use std::io::TcpStream;
|
||||
use std::old_io::TcpStream;
|
||||
use std::num::Float;
|
||||
use std::sync::mpsc::{channel, Sender};
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ use collections::BTreeMap;
|
|||
use msg::constellation_msg::PipelineId;
|
||||
use serialize::json::{self, Json, ToJson};
|
||||
use std::cell::RefCell;
|
||||
use std::io::TcpStream;
|
||||
use std::old_io::TcpStream;
|
||||
use std::sync::mpsc::{channel, Sender};
|
||||
use std::num::Float;
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ use actors::tab::{TabActor, TabActorMsg};
|
|||
use protocol::JsonPacketStream;
|
||||
|
||||
use serialize::json;
|
||||
use std::io::TcpStream;
|
||||
use std::old_io::TcpStream;
|
||||
|
||||
#[derive(RustcEncodable)]
|
||||
struct ActorTraits {
|
||||
|
|
|
@ -12,7 +12,7 @@ use devtools_traits::WantsLiveNotifications;
|
|||
use protocol::JsonPacketStream;
|
||||
|
||||
use serialize::json;
|
||||
use std::io::TcpStream;
|
||||
use std::old_io::TcpStream;
|
||||
|
||||
#[derive(RustcEncodable)]
|
||||
struct TabTraits;
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
#![crate_name = "devtools"]
|
||||
#![crate_type = "rlib"]
|
||||
|
||||
#![feature(int_uint, box_syntax)]
|
||||
#![feature(int_uint, box_syntax, io, core, rustc_private)]
|
||||
#![feature(collections, std_misc)]
|
||||
|
||||
#![allow(non_snake_case)]
|
||||
#![allow(missing_copy_implementations)]
|
||||
#![allow(unstable)]
|
||||
|
||||
#[macro_use]
|
||||
extern crate log;
|
||||
|
@ -45,8 +45,8 @@ use std::cell::RefCell;
|
|||
use std::collections::HashMap;
|
||||
use std::sync::mpsc::{channel, Receiver, Sender};
|
||||
use std::sync::mpsc::TryRecvError::{Disconnected, Empty};
|
||||
use std::io::{TcpListener, TcpStream};
|
||||
use std::io::{Acceptor, Listener, TimedOut};
|
||||
use std::old_io::{TcpListener, TcpStream};
|
||||
use std::old_io::{Acceptor, Listener, TimedOut};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use time::precise_time_ns;
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
use serialize::{json, Encodable};
|
||||
use serialize::json::Json;
|
||||
use std::io::{IoError, OtherIoError, EndOfFile, TcpStream, IoResult};
|
||||
use std::old_io::{IoError, OtherIoError, EndOfFile, TcpStream, IoResult};
|
||||
use std::num;
|
||||
|
||||
pub trait JsonPacketStream {
|
||||
|
@ -18,7 +18,7 @@ pub trait JsonPacketStream {
|
|||
|
||||
impl JsonPacketStream for TcpStream {
|
||||
fn write_json_packet<'a, T: Encodable>(&mut self, obj: &T) {
|
||||
let s = json::encode(obj).replace("__type__", "type");
|
||||
let s = json::encode(obj).unwrap().replace("__type__", "type");
|
||||
println!("<- {}", s);
|
||||
self.write_str(s.len().to_string().as_slice()).unwrap();
|
||||
self.write_u8(':' as u8).unwrap();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue