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

Upgrade to rustc 1.6.0-nightly (d5fde83ae 2015-11-12)

Browse source 
… and libc 0.2 and many other dependencies
This commit is contained in:
Manish Goregaokar 2015-11-07 22:40:18 +05:30 • committed by Josh Matthews
parent bc618b0d53
commit dc0e467945
59 changed files with 1092 additions and 978 deletions
Download patch file Download diff file Expand all files Collapse all files

570
components/servo/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

10
components/servo/Cargo.toml
View file

@ -18,7 +18,7 @@ doc = false
bench = false
[dev-dependencies]
image = "0.4.0"
image = "0.5.0"
[dev-dependencies.gfx_tests]
path = "../../tests/unit/gfx"
@ -124,10 +124,6 @@ optional = true
version = "0.3"
features = ["release_max_level_info"]
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies.euclid]
version = "0.3"
features = ["plugins"]
@ -152,4 +148,6 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
env_logger = "0.3"
time = "0.1.12"
bitflags = "0.3"
libc = "0.1"
libc = "0.2"
url = {version = "0.5", features = ["serde_serialization", "query_encoding"]}

10
components/servo/main.rs
View file

@ -229,7 +229,7 @@ mod android {
use std::borrow::ToOwned;
pub fn setup_logging() {
use self::libc::consts::os::posix88::{STDERR_FILENO, STDOUT_FILENO};
use self::libc::{STDERR_FILENO, STDOUT_FILENO};
//use std::env;
//env::set_var("RUST_LOG", "servo,gfx,msg,util,layers,js,std,rt,extra");
@ -239,14 +239,14 @@ mod android {
unsafe { super::app_dummy(); }
}
struct FilePtr(*mut self::libc::types::common::c95::FILE);
struct FilePtr(*mut self::libc::FILE);
unsafe impl Send for FilePtr {}
fn redirect_output(file_no: c_int) {
use self::libc::funcs::c95::stdio::fgets;
use self::libc::funcs::posix88::stdio::fdopen;
use self::libc::funcs::posix88::unistd::{pipe, dup2};
use self::libc::fdopen;
use self::libc::fgets;
use self::libc::{pipe, dup2};
use servo::util::task::spawn_named;
use std::ffi::CStr;
use std::ffi::CString;