servo: Merge #15424 - Fix some build warnings (from servo:warnings); r=mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: c48a326fb37976ec9e808825c9641602bccefa56

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 77f616e0b846a226174adaba0f6d545bee8288e8

servo/components/style/build_gecko.rs

@@ -4,15 +4,10 @@
 
 mod common {
     use std::env;
-    use std::path::{Path, PathBuf};
-    use std::sync::Mutex;
-    use std::time::SystemTime;
+    use std::path::PathBuf;
 
     lazy_static! {
         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";
@@ -31,10 +26,6 @@ mod common {
             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")]
@@ -46,8 +37,9 @@ mod bindings {
     use std::env;
     use std::fs::File;
     use std::io::{Read, Write};
-    use std::path::PathBuf;
+    use std::path::{Path, PathBuf};
     use std::sync::Mutex;
+    use std::time::SystemTime;
     use super::common::*;
 
     lazy_static! {
@@ -64,6 +56,13 @@ mod bindings {
             DISTDIR_PATH.join("include/nspr"),
         ];
         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> {

servo/ports/cef/lib.rs

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

servo/tests/unit/gfx/font_cache_thread.rs

@@ -4,7 +4,7 @@
 
 use gfx::font_cache_thread::FontCacheThread;
 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};
 
 #[test]

servo/tests/unit/style/properties/serialization.rs

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