Merge mozilla-inbound to mozilla-central. a=merge

.cargo/config.in

@@ -24,7 +24,7 @@ replace-with = "vendored-sources"
 
 [source."https://github.com/CraneStation/Cranelift"]
 git = "https://github.com/CraneStation/Cranelift"
-rev = "475aa632fea5360c6f8c4cc1f26e3ee0369385ef"
+rev = "e455f6ae0f3577ceb210c0ce167181c33c133a69"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]

Cargo.toml

@@ -64,8 +64,8 @@ packed_simd = { git = "https://github.com/hsivonen/packed_simd", branch = "rust_
 
 [patch.crates-io.cranelift-codegen]
 git = "https://github.com/CraneStation/Cranelift"
-rev = "475aa632fea5360c6f8c4cc1f26e3ee0369385ef"
+rev = "e455f6ae0f3577ceb210c0ce167181c33c133a69"
 
 [patch.crates-io.cranelift-wasm]
 git = "https://github.com/CraneStation/Cranelift"
-rev = "475aa632fea5360c6f8c4cc1f26e3ee0369385ef"
+rev = "e455f6ae0f3577ceb210c0ce167181c33c133a69"

js/src/wasm/cranelift/Cargo.toml

@@ -2,6 +2,7 @@
 name = "baldrdash"
 version = "0.1.0"
 authors = ["The Spidermonkey and Cranelift developers"]
+edition = "2018"
 
 [lib]
 crate-type = ["rlib"]

js/src/wasm/cranelift/baldrapi.h

@@ -21,7 +21,7 @@
 //
 // This file is input to Rust's bindgen, so as to create primitive APIs for the
 // Cranelift pipeline to access compilation metadata. The actual Rust API then
-// wraps these primitive APIs.  See src/baldrdash.rs.
+// wraps these primitive APIs.  See src/bindings/mod.rs.
 //
 // This file can be included in SpiderMonkey's C++ code, where all the prefixes
 // must be obeyed.  The purpose of the prefixes is to avoid type confusion.  See

js/src/wasm/cranelift/build.rs

@@ -17,7 +17,7 @@
 //! Build script for the Baldr <-> Cranelift bindings.
 //!
 //! This file is executed by cargo when this crate is built. It generates the
-//! `$OUT_DIR/bindings.rs` file which is then included by `src/baldrapi.rs`.
+//! `$OUT_DIR/bindings.rs` file which is then included by `src/bindings/low_level.rs`.
 
 extern crate bindgen;
 

js/src/wasm/cranelift/src/bindings/low_level.rs

@@ -0,0 +1,28 @@
+/* Copyright 2018 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//! This module exports the bindings generated by bindgen form the baldrapi.h file.
+//!
+//! The Baldr API consists of a set of C functions and some associated types.
+
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+
+// We need to allow dead code because the Rustc compiler complains about variants never being
+// constructed in TypeCode, which is true because these values come from C++.
+#![allow(dead_code)]
+
+include!(concat!(env!("OUT_DIR"), "/bindings.rs"));