diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-08-07 03:45:28 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-08-07 03:45:28 +0530 |
| commit | fb28b3ddb4530617efb40e8009609e4b238b6e5a (patch) | |
| tree | 5db1aea772bdeade7b328b81dc23a038b127ce45 | |
| parent | 889ef3aef02144ce797266e99e0cdb66ea38871a (diff) | |
| parent | d2a3a6817030b01f9491c4bed7c215cf2c606a62 (diff) | |
| download | servo-fb28b3ddb4530617efb40e8009609e4b238b6e5a.tar.gz servo-fb28b3ddb4530617efb40e8009609e4b238b6e5a.zip | |
Rollup merge of #7028 - Yoric:master, r=SimonSapin
Issue #5478 - use std::process::exit instead of lib::exit in constellation.rs
First patch.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7028)
<!-- Reviewable:end -->
| -rw-r--r-- | components/compositing/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/compositing/constellation.rs | 4 | ||||
| -rw-r--r-- | components/compositing/lib.rs | 1 | ||||
| -rw-r--r-- | components/servo/Cargo.lock | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index e3ec5f2ed24..f00f282d105 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -74,7 +74,6 @@ features = [ "serde_serialization" ] log = "0.3" num = "0.1.24" time = "0.1.17" -libc = "0.1" gleam = "0.1" euclid = "0.1" diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index a732fa797d8..28aba6346ea 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -24,7 +24,6 @@ use euclid::scale_factor::ScaleFactor; use gfx::font_cache_task::FontCacheTask; use ipc_channel::ipc::{self, IpcSender}; use layout_traits::{LayoutControlChan, LayoutTaskFactory}; -use libc; use msg::compositor_msg::{Epoch, LayerId}; use msg::constellation_msg::AnimationState; use msg::constellation_msg::Msg as ConstellationMsg; @@ -48,6 +47,7 @@ use std::collections::HashMap; use std::io::{self, Write}; use std::marker::PhantomData; use std::mem::replace; +use std::process; use std::sync::mpsc::{Receiver, Sender, channel}; use style::viewport::ViewportConstraints; use url::Url; @@ -547,7 +547,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { // Hard fail exists for test runners so we crash and that's good enough. let mut stderr = io::stderr(); stderr.write_all("Pipeline failed in hard-fail mode. Crashing!\n".as_bytes()).unwrap(); - unsafe { libc::exit(1); } + process::exit(1); } self.close_pipeline(pipeline_id, ExitPipelineMode::Force); diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 0cdafd6af59..5c3be16eff4 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -35,7 +35,6 @@ extern crate util; extern crate gleam; extern crate clipboard; -extern crate libc; extern crate time; extern crate url; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 36224dd676c..d5564dcc9fa 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -178,7 +178,6 @@ dependencies = [ "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", |