diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-08 08:00:57 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-08 08:00:57 -0700 |
| commit | 1d7148c79f9124779a910fd5291c5fa0543b2dae (patch) | |
| tree | 39c86574fa33821af51560fb6991911328bdf4e2 /components/devtools/lib.rs | |
| parent | 19cb0fa9e457c18b36944c2691c7491ee6eb9cd2 (diff) | |
| parent | 16c7060bc8ff91527ae97f8a3feee5706747b9c5 (diff) | |
| download | servo-1d7148c79f9124779a910fd5291c5fa0543b2dae.tar.gz servo-1d7148c79f9124779a910fd5291c5fa0543b2dae.zip | |
auto merge of #4554 : servo/servo/rustup_20141221, r=jdm
Diffstat (limited to 'components/devtools/lib.rs')
| -rw-r--r-- | components/devtools/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 3552fa9948a..62ab676e3b7 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -21,7 +21,6 @@ extern crate collections; extern crate core; extern crate devtools_traits; extern crate serialize; -extern crate sync; extern crate "msg" as servo_msg; extern crate "util" as servo_util; @@ -42,7 +41,7 @@ use std::comm; use std::comm::{Disconnected, Empty}; use std::io::{TcpListener, TcpStream}; use std::io::{Acceptor, Listener, TimedOut}; -use sync::{Arc, Mutex}; +use std::sync::{Arc, Mutex}; mod actor; /// Corresponds to http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/ |