servo: Merge #10269 - Fix some warnings (from jdm:cefwarn); r=Ms2ger
authorJosh Matthews <josh@joshmatthews.net>
Wed, 30 Mar 2016 08:15:07 +0500
changeset 384998 54a6fdfdbcd2aefa3c16bc2423a1dc2bbd9f90fb
parent 384997 a8c8c83985e146697640859b99c4a53941f5c390
child 384999 d0a401005d69ec952213e2189764fa545100deb0
push id7198
push userjlorenzo@mozilla.com
push dateTue, 18 Apr 2017 12:07:49 +0000
treeherdermozilla-beta@d57aa49c3948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
servo: Merge #10269 - Fix some warnings (from jdm:cefwarn); r=Ms2ger Source-Repo: https://github.com/servo/servo Source-Revision: f6d60a716c35f8ec968d259bfa1ffa606d8d15d1
servo/components/servo/Cargo.lock
servo/ports/cef/Cargo.lock
servo/ports/cef/lib.rs
servo/ports/cef/stubs.rs
servo/ports/gonk/Cargo.lock
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@@ -985,17 +985,17 @@ dependencies = [
  "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "js"
 version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#d88f289340ff32f0aa118e4621e250c0fa2f71e0"
+source = "git+https://github.com/servo/rust-mozjs#a815f57fdfa66d2490c37ebcb5d0ea067256ec21"
 dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@@ -904,17 +904,17 @@ dependencies = [
  "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "js"
 version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#d88f289340ff32f0aa118e4621e250c0fa2f71e0"
+source = "git+https://github.com/servo/rust-mozjs#a815f57fdfa66d2490c37ebcb5d0ea067256ec21"
 dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/servo/ports/cef/lib.rs
+++ b/servo/ports/cef/lib.rs
@@ -1,15 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(borrow_state)]
 #![feature(box_syntax)]
-#![feature(convert)]
 #![feature(core_intrinsics)]
 #![feature(filling_drop)]
 #![feature(iter_arith)]
 #![feature(link_args)]
 #![feature(plugin)]
 #![feature(unicode)]
 #![feature(unsafe_no_drop_flag)]
 
--- a/servo/ports/cef/stubs.rs
+++ b/servo/ports/cef/stubs.rs
@@ -4,16 +4,17 @@
 
 //! Just some stubs so that you can link against this library in place of the
 //! Chromium version of CEF. If you call these functions you will assuredly
 //! crash.
 
 macro_rules! stub(
     ($name:ident) => (
         #[no_mangle]
+        #[allow(non_snake_case)]
         pub extern "C" fn $name() {
             println!("CEF stub function called: {}", stringify!($name));
             unsafe {
                 ::std::intrinsics::abort()
             }
         }
     )
 );
--- a/servo/ports/gonk/Cargo.lock
+++ b/servo/ports/gonk/Cargo.lock
@@ -886,17 +886,17 @@ dependencies = [
  "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "js"
 version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#d88f289340ff32f0aa118e4621e250c0fa2f71e0"
+source = "git+https://github.com/servo/rust-mozjs#a815f57fdfa66d2490c37ebcb5d0ea067256ec21"
 dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]