Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Resolves #5478 - use std::process::exit instead of lib::exit in constellation.rs

Browse source
This commit is contained in:
David Rajchenbach-Teller 2015-08-06 11:51:40 +02:00
parent b9dcd49778
commit d2a3a68170
4 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/compositing/Cargo.toml
View file

@ -74,7 +74,6 @@ features = [ "serde_serialization" ]
log = "0.3" log = "0.3"
num = "0.1.24" num = "0.1.24"
time = "0.1.17" time = "0.1.17"
libc = "0.1"
gleam = "0.1" gleam = "0.1"
euclid = "0.1" euclid = "0.1"

4
components/compositing/constellation.rs
View file

@ -24,7 +24,6 @@ use euclid::scale_factor::ScaleFactor;
use gfx::font_cache_task::FontCacheTask; use gfx::font_cache_task::FontCacheTask;
use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::ipc::{self, IpcSender};
use layout_traits::{LayoutControlChan, LayoutTaskFactory}; use layout_traits::{LayoutControlChan, LayoutTaskFactory};
use libc;
use msg::compositor_msg::{Epoch, LayerId}; use msg::compositor_msg::{Epoch, LayerId};
use msg::constellation_msg::AnimationState; use msg::constellation_msg::AnimationState;
use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::Msg as ConstellationMsg;
@ -48,6 +47,7 @@ use std::collections::HashMap;
use std::io::{self, Write}; use std::io::{self, Write};
use std::marker::PhantomData; use std::marker::PhantomData;
use std::mem::replace; use std::mem::replace;
use std::process;
use std::sync::mpsc::{Receiver, Sender, channel}; use std::sync::mpsc::{Receiver, Sender, channel};
use style::viewport::ViewportConstraints; use style::viewport::ViewportConstraints;
use url::Url; 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. // Hard fail exists for test runners so we crash and that's good enough.
let mut stderr = io::stderr(); let mut stderr = io::stderr();
stderr.write_all("Pipeline failed in hard-fail mode. Crashing!\n".as_bytes()).unwrap(); 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); self.close_pipeline(pipeline_id, ExitPipelineMode::Force);

1
components/compositing/lib.rs
View file

@ -35,7 +35,6 @@ extern crate util;
extern crate gleam; extern crate gleam;
extern crate clipboard; extern crate clipboard;
extern crate libc;
extern crate time; extern crate time;
extern crate url; extern crate url;

1
components/servo/Cargo.lock generated
View file

@ -178,7 +178,6 @@ dependencies = [
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1", "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)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",