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

Fix some build warnings.

Browse source
This commit is contained in:
Ms2ger 2017-02-07 16:11:56 +01:00
parent 6fe9fd2269
commit 2ddf1f2d91
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/style/build_gecko.rs
View file

@ -4,15 +4,10 @@
mod common { mod common {
use std::env; use std::env;
use std::path::{Path, PathBuf}; use std::path::PathBuf;
use std::sync::Mutex;
use std::time::SystemTime;
lazy_static! { lazy_static! {
pub static ref OUTDIR_PATH: PathBuf = PathBuf::from(env::var("OUT_DIR").unwrap()).join("gecko"); pub static ref OUTDIR_PATH: PathBuf = PathBuf::from(env::var("OUT_DIR").unwrap()).join("gecko");
pub static ref LAST_MODIFIED: Mutex<SystemTime> =
Mutex::new(get_modified_time(&env::current_exe().unwrap())
.expect("Failed to get modified time of executable"));
} }
pub const STRUCTS_DEBUG_FILE: &'static str = "structs_debug.rs"; pub const STRUCTS_DEBUG_FILE: &'static str = "structs_debug.rs";
@ -31,10 +26,6 @@ mod common {
BuildType::Release => STRUCTS_RELEASE_FILE BuildType::Release => STRUCTS_RELEASE_FILE
} }
} }
pub fn get_modified_time(file: &Path) -> Option<SystemTime> {
file.metadata().and_then(|m| m.modified()).ok()
}
} }
#[cfg(feature = "bindgen")] #[cfg(feature = "bindgen")]
@ -46,8 +37,9 @@ mod bindings {
use std::env; use std::env;
use std::fs::File; use std::fs::File;
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::path::PathBuf; use std::path::{Path, PathBuf};
use std::sync::Mutex; use std::sync::Mutex;
use std::time::SystemTime;
use super::common::*; use super::common::*;
lazy_static! { lazy_static! {
@ -64,6 +56,13 @@ mod bindings {
DISTDIR_PATH.join("include/nspr"), DISTDIR_PATH.join("include/nspr"),
]; ];
static ref ADDED_PATHS: Mutex<HashSet<PathBuf>> = Mutex::new(HashSet::new()); static ref ADDED_PATHS: Mutex<HashSet<PathBuf>> = Mutex::new(HashSet::new());
pub static ref LAST_MODIFIED: Mutex<SystemTime> =
Mutex::new(get_modified_time(&env::current_exe().unwrap())
.expect("Failed to get modified time of executable"));
}
fn get_modified_time(file: &Path) -> Option<SystemTime> {
file.metadata().and_then(|m| m.modified()).ok()
} }
fn search_include(name: &str) -> Option<PathBuf> { fn search_include(name: &str) -> Option<PathBuf> {

1
ports/cef/lib.rs
View file

@ -41,7 +41,6 @@ extern crate cocoa;
#[cfg(target_os="macos")] #[cfg(target_os="macos")]
#[macro_use] #[macro_use]
extern crate objc; extern crate objc;
#[cfg(target_os="linux")] extern crate x11;
// Must come first. // Must come first.
pub mod macros; pub mod macros;

2
tests/unit/gfx/font_cache_thread.rs
View file

@ -4,7 +4,7 @@
use gfx::font_cache_thread::FontCacheThread; use gfx::font_cache_thread::FontCacheThread;
use ipc_channel::ipc; use ipc_channel::ipc;
use style::computed_values::font_family::{FontFamily, FamilyName}; use style::computed_values::font_family::FamilyName;
use style::font_face::{FontFaceRule, Source}; use style::font_face::{FontFaceRule, Source};
#[test] #[test]

2
tests/unit/style/properties/serialization.rs
View file

@ -884,7 +884,7 @@ mod shorthand_serialization {
use style::properties::longhands::mask_repeat as repeat; use style::properties::longhands::mask_repeat as repeat;
use style::properties::longhands::mask_size as size; use style::properties::longhands::mask_size as size;
use style::values::specified::Image; use style::values::specified::Image;
use style::values::specified::position::{HorizontalPosition, Position, VerticalPosition}; use style::values::specified::position::{HorizontalPosition, VerticalPosition};
use super::*; use super::*;
macro_rules! single_vec_value_typedef { macro_rules! single_vec_value_typedef {