mozilla rel-257 rebase part 18

rel-257/mozilla-esr60/patches/1465709-1-62a1.patch

@@ -0,0 +1,210 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1527752165 -32400
+# Node ID 5182bca90d0609f182d5a7b6b48ed2ffbbce32c2
+# Parent  5acf20344ba1f278676b2e2b075c5d0a03104eba
+Bug 1465709 - Hook rust OOM handler on rustc 1.28. r=froydnj
+
+Bug 1458161 added a rust OOM handler based on an unstable API that was
+removed in 1.27, replaced with something that didn't allow to get the
+failed allocation size.
+
+Latest 1.28 nightly (2018-06-13) has
+https://github.com/rust-lang/rust/pull/50880,
+https://github.com/rust-lang/rust/pull/51264 and
+https://github.com/rust-lang/rust/pull/51241 merged, which allow to
+hook the OOM handler and get the failed allocation size again.
+
+Because this is still an unstable API, we explicitly depend on strict
+versions of rustc. We also explicitly error out if automation builds
+end up using a rustc version that doesn't allow us to get the allocation
+size for rust OOM, because we don't want that to happen without knowing.
+
+diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
+--- a/toolkit/crashreporter/nsExceptionHandler.cpp
++++ b/toolkit/crashreporter/nsExceptionHandler.cpp
+@@ -112,16 +112,17 @@ using google_breakpad::PageAllocator;
+ using google_breakpad::auto_wasteful_vector;
+ #endif
+ using namespace mozilla;
+ using mozilla::ipc::CrashReporterClient;
+ 
+ // From toolkit/library/rust/shared/lib.rs
+ extern "C" {
+ void install_rust_panic_hook();
++void install_rust_oom_hook();
+ bool get_rust_panic_reason(char** reason, size_t* length);
+ }
+ 
+ namespace CrashReporter {
+ 
+ #ifdef XP_WIN32
+ typedef wchar_t XP_CHAR;
+ typedef std::wstring xpstring;
+@@ -1561,16 +1562,18 @@ nsresult SetExceptionHandler(nsIFile* aX
+ #endif
+ 
+   mozalloc_set_oom_abort_handler(AnnotateOOMAllocationSize);
+ 
+   oldTerminateHandler = std::set_terminate(&TerminateHandler);
+ 
+   install_rust_panic_hook();
+ 
++  install_rust_oom_hook();
++
+   InitThreadAnnotation();
+ 
+   return NS_OK;
+ }
+ 
+ bool GetEnabled() { return gExceptionHandler != nullptr; }
+ 
+ bool GetMinidumpPath(nsAString& aPath) {
+diff --git a/toolkit/library/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml
+--- a/toolkit/library/gtest/rust/Cargo.toml
++++ b/toolkit/library/gtest/rust/Cargo.toml
+@@ -10,16 +10,17 @@ bindgen = ["gkrust-shared/bindgen"]
+ servo = ["gkrust-shared/servo"]
+ quantum_render = ["gkrust-shared/quantum_render"]
+ cubeb-remoting = ["gkrust-shared/cubeb-remoting"]
+ cubeb_pulse_rust = ["gkrust-shared/cubeb_pulse_rust"]
+ gecko_debug = ["gkrust-shared/gecko_debug"]
+ simd-accel = ["gkrust-shared/simd-accel"]
+ no-static-ideograph-encoder-tables = ["gkrust-shared/no-static-ideograph-encoder-tables"]
+ oom_with_global_alloc = ["gkrust-shared/oom_with_global_alloc"]
++oom_with_hook = ["gkrust-shared/oom_with_hook"]
+ 
+ [dependencies]
+ mp4parse-gtest = { path = "../../../../dom/media/gtest" }
+ nsstring-gtest = { path = "../../../../xpcom/rust/gtest/nsstring" }
+ xpcom-gtest = { path = "../../../../xpcom/rust/gtest/xpcom" }
+ gkrust-shared = { path = "../../rust/shared" }
+ 
+ [lib]
+diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
+--- a/toolkit/library/rust/Cargo.toml
++++ b/toolkit/library/rust/Cargo.toml
+@@ -10,16 +10,17 @@ bindgen = ["gkrust-shared/bindgen"]
+ servo = ["gkrust-shared/servo"]
+ quantum_render = ["gkrust-shared/quantum_render"]
+ cubeb-remoting = ["gkrust-shared/cubeb-remoting"]
+ cubeb_pulse_rust = ["gkrust-shared/cubeb_pulse_rust"]
+ gecko_debug = ["gkrust-shared/gecko_debug"]
+ simd-accel = ["gkrust-shared/simd-accel"]
+ no-static-ideograph-encoder-tables = ["gkrust-shared/no-static-ideograph-encoder-tables"]
+ oom_with_global_alloc = ["gkrust-shared/oom_with_global_alloc"]
++oom_with_hook = ["gkrust-shared/oom_with_hook"]
+ 
+ [dependencies]
+ gkrust-shared = { path = "shared" }
+ 
+ [dev-dependencies]
+ stylo_tests = { path = "../../../servo/ports/geckolib/tests/" }
+ 
+ [lib]
+diff --git a/toolkit/library/rust/gkrust-features.mozbuild b/toolkit/library/rust/gkrust-features.mozbuild
+--- a/toolkit/library/rust/gkrust-features.mozbuild
++++ b/toolkit/library/rust/gkrust-features.mozbuild
+@@ -29,8 +29,15 @@ if (CONFIG['OS_ARCH'] == 'Linux' and CON
+     gkrust_features += ['cubeb-remoting']
+ 
+ gkrust_features += ['no-static-ideograph-encoder-tables']
+ 
+ # See details in toolkit/library/rust/shared/lib.rs
+ # A string test is not the best thing, but it works well enough here.
+ if CONFIG['RUSTC_VERSION'] < "1.27":
+     gkrust_features += ['oom_with_global_alloc']
++elif CONFIG['RUSTC_VERSION'] >= "1.28" and CONFIG['RUSTC_VERSION'] < "1.29":
++    gkrust_features += ['oom_with_hook']
++elif not CONFIG['MOZ_AUTOMATION']:
++    # We don't want builds on automation to unwillingly stop annotating OOM
++    # crash reports from rust.
++    error('Builds on automation must use a version of rust that supports OOM '
++          'hooking')
+diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
+--- a/toolkit/library/rust/shared/Cargo.toml
++++ b/toolkit/library/rust/shared/Cargo.toml
+@@ -33,16 +33,17 @@ bindgen = ["geckoservo/bindgen"]
+ servo = ["geckoservo"]
+ quantum_render = ["webrender_bindings"]
+ cubeb-remoting = ["cubeb-sys", "audioipc-client", "audioipc-server"]
+ cubeb_pulse_rust = ["cubeb-sys", "cubeb-pulse"]
+ gecko_debug = ["geckoservo/gecko_debug", "nsstring/gecko_debug"]
+ simd-accel = ["encoding_c/simd-accel", "encoding_glue/simd-accel"]
+ no-static-ideograph-encoder-tables = ["encoding_c/no-static-ideograph-encoder-tables", "encoding_glue/no-static-ideograph-encoder-tables"]
+ oom_with_global_alloc = []
++oom_with_hook = []
+ 
+ [lib]
+ path = "lib.rs"
+ test = false
+ doctest = false
+ bench = false
+ doc = false
+ plugin = false
+diff --git a/toolkit/library/rust/shared/build.rs b/toolkit/library/rust/shared/build.rs
+--- a/toolkit/library/rust/shared/build.rs
++++ b/toolkit/library/rust/shared/build.rs
+@@ -1,8 +1,8 @@
+ fn main() {
+     // This is a rather awful thing to do, but we're only doing it on
+     // versions of rustc, >= 1.24 < 1.27, that are not going to change
+     // the unstable APIs we use from under us (1.26 being a beta as of
+     // writing, and close to release).
+-    #[cfg(feature = "oom_with_global_alloc")]
++    #[cfg(any(feature = "oom_with_global_alloc", feature = "oom_with_hook"))]
+     println!("cargo:rustc-env=RUSTC_BOOTSTRAP=1");
+ }
+diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
+--- a/toolkit/library/rust/shared/lib.rs
++++ b/toolkit/library/rust/shared/lib.rs
+@@ -1,14 +1,15 @@
+ // 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/.
+ 
+ #![cfg_attr(feature = "oom_with_global_alloc",
+             feature(global_allocator, alloc, alloc_system, allocator_api))]
++#![cfg_attr(feature = "oom_with_hook", feature(oom_hook))]
+ 
+ #[cfg(feature="servo")]
+ extern crate geckoservo;
+ 
+ extern crate mp4parse_capi;
+ extern crate nsstring;
+ extern crate nserror;
+ extern crate xpcom;
+@@ -141,8 +142,33 @@ mod global_alloc {
+         }
+     }
+ 
+ }
+ 
+ #[cfg(feature = "oom_with_global_alloc")]
+ #[global_allocator]
+ static HEAP: global_alloc::GeckoHeap = global_alloc::GeckoHeap;
++
++#[cfg(feature = "oom_with_hook")]
++mod oom_hook {
++    use std::alloc::{Layout, set_oom_hook};
++
++    extern "C" {
++        fn GeckoHandleOOM(size: usize) -> !;
++    }
++
++    pub fn hook(layout: Layout) {
++        unsafe {
++            GeckoHandleOOM(layout.size());
++        }
++    }
++
++    pub fn install() {
++        set_oom_hook(hook);
++    }
++}
++
++#[no_mangle]
++pub extern "C" fn install_rust_oom_hook() {
++    #[cfg(feature = "oom_with_hook")]
++    oom_hook::install();
++}

rel-257/mozilla-esr60/patches/1465709-2-62a1.patch

@@ -0,0 +1,26 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1529533608 -32400
+# Node ID d81bb2c2682449d2d5185e26ccc89292ea95147a
+# Parent  91d580d77850f46f98a47ce810acaf05e06b0543
+Fixup moz.build error logic from bug 1465709. r=me
+
+diff --git a/toolkit/library/rust/gkrust-features.mozbuild b/toolkit/library/rust/gkrust-features.mozbuild
+--- a/toolkit/library/rust/gkrust-features.mozbuild
++++ b/toolkit/library/rust/gkrust-features.mozbuild
+@@ -31,13 +31,13 @@ if (CONFIG['OS_ARCH'] == 'Linux' and CON
+ gkrust_features += ['no-static-ideograph-encoder-tables']
+ 
+ # See details in toolkit/library/rust/shared/lib.rs
+ # A string test is not the best thing, but it works well enough here.
+ if CONFIG['RUSTC_VERSION'] < "1.27":
+     gkrust_features += ['oom_with_global_alloc']
+ elif CONFIG['RUSTC_VERSION'] >= "1.28" and CONFIG['RUSTC_VERSION'] < "1.29":
+     gkrust_features += ['oom_with_hook']
+-elif not CONFIG['MOZ_AUTOMATION']:
+-    # We don't want builds on automation to unwillingly stop annotating OOM
++elif CONFIG['MOZ_AUTOMATION']:
++    # We don't want builds on automation to unwittingly stop annotating OOM
+     # crash reports from rust.
+     error('Builds on automation must use a version of rust that supports OOM '
+           'hooking')

rel-257/mozilla-esr60/patches/1471096-1-63a1.patch

@@ -0,0 +1,907 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1529974826 -32400
+# Node ID daca982d64132d8d798b8e17881da51523e18729
+# Parent  ba8fc676351e70bc9e3428b28760a3570f8fc50a
+Bug 1471096 - Vendor rustc_version. r=froydnj
+
+diff --git a/Cargo.lock b/Cargo.lock
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -735,16 +735,17 @@ dependencies = [
+  "geckoservo 0.0.1",
+  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "mp4parse_capi 0.10.0",
+  "netwerk_helper 0.0.1",
+  "nserror 0.1.0",
+  "nsstring 0.1.0",
+  "prefs_parser 0.0.1",
+  "rust_url_capi 0.0.1",
++ "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "u2fhid 0.1.0",
+  "webrender_bindings 0.1.0",
+  "xpcom 0.1.0",
+ ]
+ 
+ [[package]]
+ name = "gl_generator"
+@@ -1518,16 +1519,24 @@ dependencies = [
+ ]
+ 
+ [[package]]
+ name = "rustc-serialize"
+ version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
++name = "rustc_version"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
+ name = "safemem"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "same-file"
+ version = "0.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -2364,16 +2373,17 @@ dependencies = [
+ "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
+ "checksum regex 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2069749032ea3ec200ca51e4a31df41759190a88edca0d2d86ee8bedf7073341"
+ "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
+ "checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d"
+ "checksum ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "da06feaa07f69125ab9ddc769b11de29090122170b402547f64b86fe16ebc399"
+ "checksum runloop 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d79b4b604167921892e84afbbaad9d5ad74e091bf6c511d9dbfb0593f09fabd"
+ "checksum rust-ini 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22dab655e8122ccb15db25a56852ce62506f1486cdefd37e86371bf34ea8f601"
+ "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
++"checksum rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9743a7670d88d5d52950408ecdb7c71d8986251ab604d4689dd2ca25c9bca69"
+ "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
+ "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
+ "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
+ "checksum scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c79eb2c3ac4bc2507cda80e7f3ac5b88bd8eae4c0914d5663e6a8933994be918"
+ "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
+ "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+ "checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526"
+ "checksum serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)" = "<none>"
+diff --git a/third_party/rust/rustc_version/.cargo-checksum.json b/third_party/rust/rustc_version/.cargo-checksum.json
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/.cargo-checksum.json
+@@ -0,0 +1,1 @@
++{"files":{".travis.yml":"bf8d4e64585fb3976fe433a6a8835f4a134c611392a597c76bec263d84fa55e7","Cargo.toml":"2f437f4dd58d6813bfa542ffb1ed4c970c3670739f92c41346230e7a5b05796a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"b4cb2c1de00ae7382a77431d221a52e10a8a62170cdc1a2ad1c1e711bea7817f","src/errors.rs":"b28c2eeb1278fc3e8d68a64b177034faed67f6762335729d3a6d1e61be8fb034","src/lib.rs":"6a5d5ceb57cf03955af1dbb80a6401ca6d5eac65211d0594354b38b465ce7b45"},"package":"b9743a7670d88d5d52950408ecdb7c71d8986251ab604d4689dd2ca25c9bca69"}
+\ No newline at end of file
+diff --git a/third_party/rust/rustc_version/.travis.yml b/third_party/rust/rustc_version/.travis.yml
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/.travis.yml
+@@ -0,0 +1,21 @@
++language: rust
++rust:
++- nightly
++- beta
++- stable
++before_script:
++- |
++  pip install 'travis-cargo<0.2' --user &&
++  export PATH=$HOME/.local/bin:$PATH
++script:
++- |
++  travis-cargo build &&
++  travis-cargo test &&
++  travis-cargo bench &&
++  travis-cargo --only stable doc
++after_success:
++- travis-cargo --only stable doc-upload
++env:
++  global:
++  - TRAVIS_CARGO_NIGHTLY_FEATURE=""
++  - secure: mxQyrd6tyvcC10H7crLgKSSRHwquSnLb5mjzaj8iXf4mkooKpoRaffIiwmGf0IACQUN3nKlA6D6irfD2CqaFiUiUav8RqeAd8FjHFTlYu0nKZkqB1iGZBA7/JrW7mlGJIdmNIbzVRoPRQI/lY/730M/eqxIAb+9/xaSktkD2cJYGUikdiyeTm8idezkB+BOOWIN20yopLWzmBIVs7doQJOA0ewqMlEduwn6axvEk17r9qlSgucywDsTvDWkXSAuYldyJU4PdFez4t10sGsXx+TKfbwcaRmwaOj/MImZUVCtQvutEW9Hb/2hJXjCN2uefZ64BfodKn3wyB7ie7PgOixsLkqoR01d/qbfDsWGg/4iLi3DCq5bVtWJoCCT4lS8kfwi8D8HmvcoCQnT+CdU4LhlV9aHTSEMx0SEJW0DHYE/RnoqJjCj+QsK4ji7HAnyYWVwSGYJfnrL0EAwKararAzKY/vABStJKu1IlBzKCsjIQ+0hMpqnFiWldhfRHt/rYhBtK+HYXElamc8xpF/taK8E40NSHDgC+4TciTAZtyAXOWiMhXS0653U3hvJqYY/LtHmobpIqc1XkHe53gQ0QrBd6UsyUN9FjWOLxvPUx4zcyNFJHXcFiwevfK6gYF+OXepVu8TznAQLSP7ToA7KXbhSSVQDM+7UFVcT41VgDbGY=
+diff --git a/third_party/rust/rustc_version/Cargo.toml b/third_party/rust/rustc_version/Cargo.toml
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/Cargo.toml
+@@ -0,0 +1,15 @@
++[package]
++name = "rustc_version"
++version = "0.2.1"
++authors = ["Marvin Löbel <loebel.marvin@gmail.com>"]
++license = "MIT/Apache-2.0"
++
++description = "A library for querying the version of a installed rustc compiler"
++readme = "README.md"
++documentation = "http://kimundi.github.io/rustc-version-rs/rustc_version/index.html"
++
++repository = "https://github.com/Kimundi/rustc-version-rs"
++keywords = ["version", "rustc"]
++
++[dependencies]
++semver = "0.6"
+diff --git a/third_party/rust/rustc_version/LICENSE-APACHE b/third_party/rust/rustc_version/LICENSE-APACHE
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/LICENSE-APACHE
+@@ -0,0 +1,201 @@
++                              Apache License
++                        Version 2.0, January 2004
++                     http://www.apache.org/licenses/
++
++TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
++
++1. Definitions.
++
++   "License" shall mean the terms and conditions for use, reproduction,
++   and distribution as defined by Sections 1 through 9 of this document.
++
++   "Licensor" shall mean the copyright owner or entity authorized by
++   the copyright owner that is granting the License.
++
++   "Legal Entity" shall mean the union of the acting entity and all
++   other entities that control, are controlled by, or are under common
++   control with that entity. For the purposes of this definition,
++   "control" means (i) the power, direct or indirect, to cause the
++   direction or management of such entity, whether by contract or
++   otherwise, or (ii) ownership of fifty percent (50%) or more of the
++   outstanding shares, or (iii) beneficial ownership of such entity.
++
++   "You" (or "Your") shall mean an individual or Legal Entity
++   exercising permissions granted by this License.
++
++   "Source" form shall mean the preferred form for making modifications,
++   including but not limited to software source code, documentation
++   source, and configuration files.
++
++   "Object" form shall mean any form resulting from mechanical
++   transformation or translation of a Source form, including but
++   not limited to compiled object code, generated documentation,
++   and conversions to other media types.
++
++   "Work" shall mean the work of authorship, whether in Source or
++   Object form, made available under the License, as indicated by a
++   copyright notice that is included in or attached to the work
++   (an example is provided in the Appendix below).
++
++   "Derivative Works" shall mean any work, whether in Source or Object
++   form, that is based on (or derived from) the Work and for which the
++   editorial revisions, annotations, elaborations, or other modifications
++   represent, as a whole, an original work of authorship. For the purposes
++   of this License, Derivative Works shall not include works that remain
++   separable from, or merely link (or bind by name) to the interfaces of,
++   the Work and Derivative Works thereof.
++
++   "Contribution" shall mean any work of authorship, including
++   the original version of the Work and any modifications or additions
++   to that Work or Derivative Works thereof, that is intentionally
++   submitted to Licensor for inclusion in the Work by the copyright owner
++   or by an individual or Legal Entity authorized to submit on behalf of
++   the copyright owner. For the purposes of this definition, "submitted"
++   means any form of electronic, verbal, or written communication sent
++   to the Licensor or its representatives, including but not limited to
++   communication on electronic mailing lists, source code control systems,
++   and issue tracking systems that are managed by, or on behalf of, the
++   Licensor for the purpose of discussing and improving the Work, but
++   excluding communication that is conspicuously marked or otherwise
++   designated in writing by the copyright owner as "Not a Contribution."
++
++   "Contributor" shall mean Licensor and any individual or Legal Entity
++   on behalf of whom a Contribution has been received by Licensor and
++   subsequently incorporated within the Work.
++
++2. Grant of Copyright License. Subject to the terms and conditions of
++   this License, each Contributor hereby grants to You a perpetual,
++   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
++   copyright license to reproduce, prepare Derivative Works of,
++   publicly display, publicly perform, sublicense, and distribute the
++   Work and such Derivative Works in Source or Object form.
++
++3. Grant of Patent License. Subject to the terms and conditions of
++   this License, each Contributor hereby grants to You a perpetual,
++   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
++   (except as stated in this section) patent license to make, have made,
++   use, offer to sell, sell, import, and otherwise transfer the Work,
++   where such license applies only to those patent claims licensable
++   by such Contributor that are necessarily infringed by their
++   Contribution(s) alone or by combination of their Contribution(s)
++   with the Work to which such Contribution(s) was submitted. If You
++   institute patent litigation against any entity (including a
++   cross-claim or counterclaim in a lawsuit) alleging that the Work
++   or a Contribution incorporated within the Work constitutes direct
++   or contributory patent infringement, then any patent licenses
++   granted to You under this License for that Work shall terminate
++   as of the date such litigation is filed.
++
++4. Redistribution. You may reproduce and distribute copies of the
++   Work or Derivative Works thereof in any medium, with or without
++   modifications, and in Source or Object form, provided that You
++   meet the following conditions:
++
++   (a) You must give any other recipients of the Work or
++       Derivative Works a copy of this License; and
++
++   (b) You must cause any modified files to carry prominent notices
++       stating that You changed the files; and
++
++   (c) You must retain, in the Source form of any Derivative Works
++       that You distribute, all copyright, patent, trademark, and
++       attribution notices from the Source form of the Work,
++       excluding those notices that do not pertain to any part of
++       the Derivative Works; and
++
++   (d) If the Work includes a "NOTICE" text file as part of its
++       distribution, then any Derivative Works that You distribute must
++       include a readable copy of the attribution notices contained
++       within such NOTICE file, excluding those notices that do not
++       pertain to any part of the Derivative Works, in at least one
++       of the following places: within a NOTICE text file distributed
++       as part of the Derivative Works; within the Source form or
++       documentation, if provided along with the Derivative Works; or,
++       within a display generated by the Derivative Works, if and
++       wherever such third-party notices normally appear. The contents
++       of the NOTICE file are for informational purposes only and
++       do not modify the License. You may add Your own attribution
++       notices within Derivative Works that You distribute, alongside
++       or as an addendum to the NOTICE text from the Work, provided
++       that such additional attribution notices cannot be construed
++       as modifying the License.
++
++   You may add Your own copyright statement to Your modifications and
++   may provide additional or different license terms and conditions
++   for use, reproduction, or distribution of Your modifications, or
++   for any such Derivative Works as a whole, provided Your use,
++   reproduction, and distribution of the Work otherwise complies with
++   the conditions stated in this License.
++
++5. Submission of Contributions. Unless You explicitly state otherwise,
++   any Contribution intentionally submitted for inclusion in the Work
++   by You to the Licensor shall be under the terms and conditions of
++   this License, without any additional terms or conditions.
++   Notwithstanding the above, nothing herein shall supersede or modify
++   the terms of any separate license agreement you may have executed
++   with Licensor regarding such Contributions.
++
++6. Trademarks. This License does not grant permission to use the trade
++   names, trademarks, service marks, or product names of the Licensor,
++   except as required for reasonable and customary use in describing the
++   origin of the Work and reproducing the content of the NOTICE file.
++
++7. Disclaimer of Warranty. Unless required by applicable law or
++   agreed to in writing, Licensor provides the Work (and each
++   Contributor provides its Contributions) on an "AS IS" BASIS,
++   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
++   implied, including, without limitation, any warranties or conditions
++   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
++   PARTICULAR PURPOSE. You are solely responsible for determining the
++   appropriateness of using or redistributing the Work and assume any
++   risks associated with Your exercise of permissions under this License.
++
++8. Limitation of Liability. In no event and under no legal theory,
++   whether in tort (including negligence), contract, or otherwise,
++   unless required by applicable law (such as deliberate and grossly
++   negligent acts) or agreed to in writing, shall any Contributor be
++   liable to You for damages, including any direct, indirect, special,
++   incidental, or consequential damages of any character arising as a
++   result of this License or out of the use or inability to use the
++   Work (including but not limited to damages for loss of goodwill,
++   work stoppage, computer failure or malfunction, or any and all
++   other commercial damages or losses), even if such Contributor
++   has been advised of the possibility of such damages.
++
++9. Accepting Warranty or Additional Liability. While redistributing
++   the Work or Derivative Works thereof, You may choose to offer,
++   and charge a fee for, acceptance of support, warranty, indemnity,
++   or other liability obligations and/or rights consistent with this
++   License. However, in accepting such obligations, You may act only
++   on Your own behalf and on Your sole responsibility, not on behalf
++   of any other Contributor, and only if You agree to indemnify,
++   defend, and hold each Contributor harmless for any liability
++   incurred by, or claims asserted against, such Contributor by reason
++   of your accepting any such warranty or additional liability.
++
++END OF TERMS AND CONDITIONS
++
++APPENDIX: How to apply the Apache License to your work.
++
++   To apply the Apache License to your work, attach the following
++   boilerplate notice, with the fields enclosed by brackets "[]"
++   replaced with your own identifying information. (Don't include
++   the brackets!)  The text should be enclosed in the appropriate
++   comment syntax for the file format. We also recommend that a
++   file or class name and description of purpose be included on the
++   same "printed page" as the copyright notice for easier
++   identification within third-party archives.
++
++Copyright [yyyy] [name of copyright owner]
++
++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.
+diff --git a/third_party/rust/rustc_version/LICENSE-MIT b/third_party/rust/rustc_version/LICENSE-MIT
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/LICENSE-MIT
+@@ -0,0 +1,25 @@
++Copyright (c) 2016 The Rust Project Developers
++
++Permission is hereby granted, free of charge, to any
++person obtaining a copy of this software and associated
++documentation files (the "Software"), to deal in the
++Software without restriction, including without
++limitation the rights to use, copy, modify, merge,
++publish, distribute, sublicense, and/or sell copies of
++the Software, and to permit persons to whom the Software
++is furnished to do so, subject to the following
++conditions:
++
++The above copyright notice and this permission notice
++shall be included in all copies or substantial portions
++of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
++ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
++TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
++PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
++SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
++IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++DEALINGS IN THE SOFTWARE.
+diff --git a/third_party/rust/rustc_version/README.md b/third_party/rust/rustc_version/README.md
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/README.md
+@@ -0,0 +1,75 @@
++rustc-version-rs
++==============
++
++A library for querying the version of a `rustc` compiler.
++
++This can be used by build scripts or other tools dealing with Rust sources
++to make decisions based on the version of the compiler.
++
++[![Travis-CI Status](https://travis-ci.org/Kimundi/rustc-version-rs.png?branch=master)](https://travis-ci.org/Kimundi/rustc-version-rs)
++
++# Getting Started
++
++[rustc-version-rs is available on crates.io](https://crates.io/crates/rustc_version).
++It is recommended to look there for the newest released version, as well as links to the newest builds of the docs.
++
++At the point of the last update of this README, the latest published version could be used like this:
++
++Add the following dependency to your Cargo manifest...
++
++```toml
++[dependencies]
++rustc_version = "0.2"
++```
++
++...and see the [docs](http://kimundi.github.io/rustc-version-rs/rustc_version/index.html) for how to use it.
++
++# Example
++
++```rust
++// This could be a cargo build script
++
++extern crate rustc_version;
++use rustc_version::{version, version_meta, Channel, Version};
++
++fn main() {
++    // Assert we haven't travelled back in time
++    assert!(version().unwrap().major >= 1);
++
++    // Set cfg flags depending on release channel
++    match version_meta().unwrap().channel {
++        Channel::Stable => {
++            println!("cargo:rustc-cfg=RUSTC_IS_STABLE");
++        }
++        Channel::Beta => {
++            println!("cargo:rustc-cfg=RUSTC_IS_BETA");
++        }
++        Channel::Nightly => {
++            println!("cargo:rustc-cfg=RUSTC_IS_NIGHTLY");
++        }
++        Channel::Dev => {
++            println!("cargo:rustc-cfg=RUSTC_IS_DEV");
++        }
++    }
++
++    // Check for a minimum version
++    if version().unwrap() >= Version::parse("1.4.0").unwrap() {
++        println!("cargo:rustc-cfg=compiler_has_important_bugfix");
++    }
++}
++```
++
++## License
++
++Licensed under either of
++
++ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
++ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
++
++at your option.
++
++### Contribution
++
++Unless you explicitly state otherwise, any contribution intentionally submitted
++for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
++additional terms or conditions.
+diff --git a/third_party/rust/rustc_version/src/errors.rs b/third_party/rust/rustc_version/src/errors.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/src/errors.rs
+@@ -0,0 +1,79 @@
++use std::{self, error, fmt, io, str};
++use semver::{self, Identifier};
++
++/// The error type for this crate.
++#[derive(Debug)]
++pub enum Error {
++    /// An error ocurrend when executing the `rustc` command.
++    CouldNotExecuteCommand(io::Error),
++    /// The output of `rustc -vV` was not valid utf-8.
++    Utf8Error(str::Utf8Error),
++    /// The output of `rustc -vV` was not in the expected format.
++    UnexpectedVersionFormat,
++    /// An error ocurred in parsing a `VersionReq`.
++    ReqParseError(semver::ReqParseError),
++    /// An error ocurred in parsing the semver.
++    SemVerError(semver::SemVerError),
++    /// The pre-release tag is unknown.
++    UnknownPreReleaseTag(Identifier),
++}
++use Error::*;
++
++impl fmt::Display for Error {
++    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
++        use std::error::Error;
++        match *self {
++            CouldNotExecuteCommand(ref e) => write!(f, "{}: {}", self.description(), e),
++            Utf8Error(_) => write!(f, "{}", self.description()),
++            UnexpectedVersionFormat => write!(f, "{}", self.description()),
++            ReqParseError(ref e) => write!(f, "{}: {}", self.description(), e),
++            SemVerError(ref e) => write!(f, "{}: {}", self.description(), e),
++            UnknownPreReleaseTag(ref i) => write!(f, "{}: {}", self.description(), i),
++        }
++    }
++}
++
++impl error::Error for Error {
++    fn cause(&self) -> Option<&error::Error> {
++        match *self {
++            CouldNotExecuteCommand(ref e) => Some(e),
++            Utf8Error(ref e) => Some(e),
++            UnexpectedVersionFormat => None,
++            ReqParseError(ref e) => Some(e),
++            SemVerError(ref e) => Some(e),
++            UnknownPreReleaseTag(_) => None,
++        }
++    }
++
++    fn description(&self) -> &str {
++        match *self {
++            CouldNotExecuteCommand(_) => "could not execute command",
++            Utf8Error(_) => "invalid UTF-8 output from `rustc -vV`",
++            UnexpectedVersionFormat => "unexpected `rustc -vV` format",
++            ReqParseError(_) => "error parsing version requirement",
++            SemVerError(_) => "error parsing version",
++            UnknownPreReleaseTag(_) => "unknown pre-release tag",
++        }
++    }
++}
++
++macro_rules! impl_from {
++    ($($err_ty:ty => $variant:ident),* $(,)*) => {
++        $(
++            impl From<$err_ty> for Error {
++                fn from(e: $err_ty) -> Error {
++                    Error::$variant(e)
++                }
++            }
++        )*
++    }
++}
++
++impl_from! {
++    str::Utf8Error => Utf8Error,
++    semver::SemVerError => SemVerError,
++    semver::ReqParseError => ReqParseError,
++}
++
++/// The result type for this crate.
++pub type Result<T> = std::result::Result<T, Error>;
+diff --git a/third_party/rust/rustc_version/src/lib.rs b/third_party/rust/rustc_version/src/lib.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/rustc_version/src/lib.rs
+@@ -0,0 +1,353 @@
++// Copyright 2016 rustc-version-rs developers
++//
++// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
++// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
++// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
++// option. This file may not be copied, modified, or distributed
++// except according to those terms.
++
++#![warn(missing_docs)]
++
++//! Simple library for getting the version information of a `rustc`
++//! compiler.
++//!
++//! This can be used by build scripts or other tools dealing with Rust sources
++//! to make decisions based on the version of the compiler.
++//!
++//! It calls `$RUSTC --version -v` and parses the output, falling
++//! back to `rustc` if `$RUSTC` is not set.
++//!
++//! # Example
++//!
++//! ```rust
++//! // This could be a cargo build script
++//!
++//! extern crate rustc_version;
++//! use rustc_version::{version, version_meta, Channel, Version};
++//!
++//! fn main() {
++//!     // Assert we haven't travelled back in time
++//!     assert!(version().unwrap().major >= 1);
++//!
++//!     // Set cfg flags depending on release channel
++//!     match version_meta().unwrap().channel {
++//!         Channel::Stable => {
++//!             println!("cargo:rustc-cfg=RUSTC_IS_STABLE");
++//!         }
++//!         Channel::Beta => {
++//!             println!("cargo:rustc-cfg=RUSTC_IS_BETA");
++//!         }
++//!         Channel::Nightly => {
++//!             println!("cargo:rustc-cfg=RUSTC_IS_NIGHTLY");
++//!         }
++//!         Channel::Dev => {
++//!             println!("cargo:rustc-cfg=RUSTC_IS_DEV");
++//!         }
++//!     }
++//!
++//!     // Check for a minimum version
++//!     if version().unwrap() >= Version::parse("1.4.0").unwrap() {
++//!         println!("cargo:rustc-cfg=compiler_has_important_bugfix");
++//!     }
++//! }
++//! ```
++
++extern crate semver;
++use semver::Identifier;
++use std::process::Command;
++use std::{env, str};
++use std::ffi::OsString;
++
++// Convenience re-export to allow version comparison without needing to add
++// semver crate.
++pub use semver::Version;
++
++mod errors;
++pub use errors::{Error, Result};
++
++/// Release channel of the compiler.
++#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
++pub enum Channel {
++    /// Development release channel
++    Dev,
++    /// Nightly release channel
++    Nightly,
++    /// Beta release channel
++    Beta,
++    /// Stable release channel
++    Stable,
++}
++
++/// Rustc version plus metada like git short hash and build date.
++#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
++pub struct VersionMeta {
++    /// Version of the compiler
++    pub semver: Version,
++
++    /// Git short hash of the build of the compiler
++    pub commit_hash: Option<String>,
++
++    /// Commit date of the compiler
++    pub commit_date: Option<String>,
++
++    /// Build date of the compiler; this was removed between Rust 1.0.0 and 1.1.0.
++    pub build_date: Option<String>,
++
++    /// Release channel of the compiler
++    pub channel: Channel,
++
++    /// Host target triple of the compiler
++    pub host: String,
++
++    /// Short version string of the compiler
++    pub short_version_string: String,
++}
++
++impl VersionMeta {
++    /// Returns the version metadata for `cmd`, which should be a `rustc` command.
++    pub fn for_command(cmd: Command) -> Result<VersionMeta> {
++        let mut cmd = cmd;
++
++        let out = match cmd.arg("-vV").output() {
++            Err(e) => return Err(Error::CouldNotExecuteCommand(e)),
++            Ok(out) => out,
++        };
++        let out = try!(str::from_utf8(&out.stdout));
++
++        version_meta_for(out)
++    }
++}
++
++/// Returns the `rustc` SemVer version.
++pub fn version() -> Result<Version> {
++    Ok(try!(version_meta()).semver)
++}
++
++/// Returns the `rustc` SemVer version and additional metadata
++/// like the git short hash and build date.
++pub fn version_meta() -> Result<VersionMeta> {
++    let cmd = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
++
++    VersionMeta::for_command(Command::new(cmd))
++
++}
++
++/// Parses a "rustc -vV" output string and returns
++/// the SemVer version and additional metadata
++/// like the git short hash and build date.
++pub fn version_meta_for(verbose_version_string: &str) -> Result<VersionMeta> {
++    let out: Vec<_> = verbose_version_string.lines().collect();
++
++    if !(out.len() >= 6 && out.len() <= 8) {
++        return Err(Error::UnexpectedVersionFormat);
++    }
++
++    let short_version_string = out[0];
++
++    fn expect_prefix<'a>(line: &'a str, prefix: &str) -> Result<&'a str> {
++        match line.starts_with(prefix) {
++            true => Ok(&line[prefix.len()..]),
++            false => Err(Error::UnexpectedVersionFormat),
++        }
++    }
++
++    let commit_hash = match try!(expect_prefix(out[2], "commit-hash: ")) {
++        "unknown" => None,
++        hash => Some(hash.to_owned()),
++    };
++
++    let commit_date = match try!(expect_prefix(out[3], "commit-date: ")) {
++        "unknown" => None,
++        hash => Some(hash.to_owned()),
++    };
++
++    // Handle that the build date may or may not be present.
++    let mut idx = 4;
++    let mut build_date = None;
++    if out[idx].starts_with("build-date") {
++        build_date = match try!(expect_prefix(out[idx], "build-date: ")) {
++            "unknown" => None,
++            s => Some(s.to_owned()),
++        };
++        idx = idx + 1;
++    }
++
++    let host = try!(expect_prefix(out[idx], "host: "));
++    idx = idx + 1;
++    let release = try!(expect_prefix(out[idx], "release: "));
++
++    let semver: Version = try!(release.parse());
++
++    let channel = if semver.pre.is_empty() {
++        Channel::Stable
++    } else {
++        match semver.pre[0] {
++            Identifier::AlphaNumeric(ref s)
++                if s == "dev" => Channel::Dev,
++            Identifier::AlphaNumeric(ref s)
++                if s == "beta" => Channel::Beta,
++            Identifier::AlphaNumeric(ref s)
++                if s == "nightly" => Channel::Nightly,
++            ref x => return Err(Error::UnknownPreReleaseTag(x.clone())),
++        }
++    };
++
++    Ok(VersionMeta {
++        semver: semver,
++        commit_hash: commit_hash,
++        commit_date: commit_date,
++        build_date: build_date,
++        channel: channel,
++        host: host.into(),
++        short_version_string: short_version_string.into(),
++    })
++}
++
++#[test]
++fn smoketest() {
++    let v = version().unwrap();
++    assert!(v.major >= 1);
++
++    let v = version_meta().unwrap();
++    assert!(v.semver.major >= 1);
++
++    assert!(version().unwrap() >= Version::parse("1.0.0").unwrap());
++}
++
++#[test]
++fn parse_unexpected() {
++    let res = version_meta_for(
++"rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)
++binary: rustc
++commit-hash: a59de37e99060162a2674e3ff45409ac73595c0e
++commit-date: 2015-05-13
++rust-birthday: 2015-05-14
++host: x86_64-unknown-linux-gnu
++release: 1.0.0");
++
++    assert!(match res {
++        Err(Error::UnexpectedVersionFormat) => true,
++        _ => false,
++    });
++
++}
++
++#[test]
++fn parse_1_0_0() {
++    let version = version_meta_for(
++"rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)
++binary: rustc
++commit-hash: a59de37e99060162a2674e3ff45409ac73595c0e
++commit-date: 2015-05-13
++build-date: 2015-05-14
++host: x86_64-unknown-linux-gnu
++release: 1.0.0").unwrap();
++
++    assert_eq!(version.semver, Version::parse("1.0.0").unwrap());
++    assert_eq!(version.commit_hash, Some("a59de37e99060162a2674e3ff45409ac73595c0e".into()));
++    assert_eq!(version.commit_date, Some("2015-05-13".into()));
++    assert_eq!(version.build_date, Some("2015-05-14".into()));
++    assert_eq!(version.channel, Channel::Stable);
++    assert_eq!(version.host, "x86_64-unknown-linux-gnu");
++    assert_eq!(version.short_version_string, "rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)");
++}
++
++
++#[test]
++fn parse_unknown() {
++    let version = version_meta_for(
++"rustc 1.3.0
++binary: rustc
++commit-hash: unknown
++commit-date: unknown
++host: x86_64-unknown-linux-gnu
++release: 1.3.0").unwrap();
++
++    assert_eq!(version.semver, Version::parse("1.3.0").unwrap());
++    assert_eq!(version.commit_hash, None);
++    assert_eq!(version.commit_date, None);
++    assert_eq!(version.channel, Channel::Stable);
++    assert_eq!(version.host, "x86_64-unknown-linux-gnu");
++    assert_eq!(version.short_version_string, "rustc 1.3.0");
++}
++
++#[test]
++fn parse_nightly() {
++    let version = version_meta_for(
++"rustc 1.5.0-nightly (65d5c0833 2015-09-29)
++binary: rustc
++commit-hash: 65d5c083377645a115c4ac23a620d3581b9562b6
++commit-date: 2015-09-29
++host: x86_64-unknown-linux-gnu
++release: 1.5.0-nightly").unwrap();
++
++    assert_eq!(version.semver, Version::parse("1.5.0-nightly").unwrap());
++    assert_eq!(version.commit_hash, Some("65d5c083377645a115c4ac23a620d3581b9562b6".into()));
++    assert_eq!(version.commit_date, Some("2015-09-29".into()));
++    assert_eq!(version.channel, Channel::Nightly);
++    assert_eq!(version.host, "x86_64-unknown-linux-gnu");
++    assert_eq!(version.short_version_string, "rustc 1.5.0-nightly (65d5c0833 2015-09-29)");
++}
++
++#[test]
++fn parse_stable() {
++    let version = version_meta_for(
++"rustc 1.3.0 (9a92aaf19 2015-09-15)
++binary: rustc
++commit-hash: 9a92aaf19a64603b02b4130fe52958cc12488900
++commit-date: 2015-09-15
++host: x86_64-unknown-linux-gnu
++release: 1.3.0").unwrap();
++
++    assert_eq!(version.semver, Version::parse("1.3.0").unwrap());
++    assert_eq!(version.commit_hash, Some("9a92aaf19a64603b02b4130fe52958cc12488900".into()));
++    assert_eq!(version.commit_date, Some("2015-09-15".into()));
++    assert_eq!(version.channel, Channel::Stable);
++    assert_eq!(version.host, "x86_64-unknown-linux-gnu");
++    assert_eq!(version.short_version_string, "rustc 1.3.0 (9a92aaf19 2015-09-15)");
++}
++
++#[test]
++fn parse_1_16_0_nightly() {
++    let version = version_meta_for(
++"rustc 1.16.0-nightly (5d994d8b7 2017-01-05)
++binary: rustc
++commit-hash: 5d994d8b7e482e87467d4a521911477bd8284ce3
++commit-date: 2017-01-05
++host: x86_64-unknown-linux-gnu
++release: 1.16.0-nightly
++LLVM version: 3.9").unwrap();
++
++    assert_eq!(version.semver, Version::parse("1.16.0-nightly").unwrap());
++    assert_eq!(version.commit_hash, Some("5d994d8b7e482e87467d4a521911477bd8284ce3".into()));
++    assert_eq!(version.commit_date, Some("2017-01-05".into()));
++    assert_eq!(version.channel, Channel::Nightly);
++    assert_eq!(version.host, "x86_64-unknown-linux-gnu");
++    assert_eq!(version.short_version_string, "rustc 1.16.0-nightly (5d994d8b7 2017-01-05)");
++}
++
++/*
++#[test]
++fn version_matches_replacement() {
++    let f = |s1: &str, s2: &str| {
++        let a = Version::parse(s1).unwrap();
++        let b = Version::parse(s2).unwrap();
++        println!("{} <= {} : {}", s1, s2, a <= b);
++    };
++
++    println!();
++
++    f("1.5.0",         "1.5.0");
++    f("1.5.0-nightly", "1.5.0");
++    f("1.5.0",         "1.5.0-nightly");
++    f("1.5.0-nightly", "1.5.0-nightly");
++
++    f("1.5.0",         "1.6.0");
++    f("1.5.0-nightly", "1.6.0");
++    f("1.5.0",         "1.6.0-nightly");
++    f("1.5.0-nightly", "1.6.0-nightly");
++
++    panic!();
++
++}
++*/
+diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
+--- a/toolkit/library/rust/shared/Cargo.toml
++++ b/toolkit/library/rust/shared/Cargo.toml
+@@ -22,16 +22,21 @@ encoding_glue = { path = "../../../../in
+ audioipc-client = { path = "../../../../media/audioipc/client", optional = true }
+ audioipc-server = { path = "../../../../media/audioipc/server", optional = true }
+ u2fhid = { path = "../../../../dom/webauthn/u2f-hid-rs" }
+ # We have these to enforce common feature sets for said crates.
+ log = {version = "0.3", features = ["release_max_level_info"]}
+ syn = { version = "0.11", features = ["full", "visit", "parsing"] }
+ cose-c = { version = "0.1.5" }
+ 
++[build-dependencies]
++# Use exactly version 0.2.1, which uses semver 0.6, which other crates
++# require (0.2.2 requires 0.9)
++rustc_version = "=0.2.1"
++
+ [features]
+ default = []
+ bindgen = ["geckoservo/bindgen"]
+ servo = ["geckoservo"]
+ quantum_render = ["webrender_bindings"]
+ cubeb-remoting = ["cubeb-sys", "audioipc-client", "audioipc-server"]
+ cubeb_pulse_rust = ["cubeb-sys", "cubeb-pulse"]
+ gecko_debug = ["geckoservo/gecko_debug", "nsstring/gecko_debug"]

rel-257/mozilla-esr60/patches/1471096-2-63a1.patch

@@ -0,0 +1,160 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1529706506 -32400
+# Node ID 909312d0fc69e078cd26c545df63067baada1816
+# Parent  1e7397cb8af8fc6ba0a0ba722ff3c97e1cb6e98f
+Bug 1471096 - Choose OOM hooking version to use at build time rather than configure time. r=froydnj
+
+When I originally implemented bug 1458161, this is how it was done, but
+it was suggested to use a configure-time check. This turned out to not
+be great, because the rust compiler changes regularly, and we don't run
+the configure tests when the version changes. When people upgraded their
+rust compiler to 1.27, the code subsequently failed to build because the
+features were still set for the previous version they had installed.
+
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -250,18 +250,16 @@ def rust_target_env_name(triple):
+ # We need this to form various Cargo environment variables, as there is no
+ # uppercase function in make, and we don't want to shell out just for
+ # converting a string to uppercase.
+ set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
+ 
+ # This is used for putting source info into symbol files.
+ set_config('RUSTC_COMMIT', depends(rustc_info)(lambda i: i.commit))
+ 
+-set_config('RUSTC_VERSION', depends(rustc_info)(lambda i: str(i.version)))
+-
+ # Until we remove all the other Rust checks in old-configure.
+ add_old_configure_assignment('RUSTC', rustc)
+ add_old_configure_assignment('RUST_TARGET', rust_target_triple)
+ 
+ # Rustdoc is required by Rust tests below.
+ rustdoc = check_prog('RUSTDOC', add_rustup_path('rustdoc'), allow_missing=True)
+ 
+ # This option is separate from --enable-tests because Rust tests are particularly
+diff --git a/toolkit/library/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml
+--- a/toolkit/library/gtest/rust/Cargo.toml
++++ b/toolkit/library/gtest/rust/Cargo.toml
+@@ -9,18 +9,16 @@ description = "Testing code for libgkrus
+ bindgen = ["gkrust-shared/bindgen"]
+ servo = ["gkrust-shared/servo"]
+ quantum_render = ["gkrust-shared/quantum_render"]
+ cubeb-remoting = ["gkrust-shared/cubeb-remoting"]
+ cubeb_pulse_rust = ["gkrust-shared/cubeb_pulse_rust"]
+ gecko_debug = ["gkrust-shared/gecko_debug"]
+ simd-accel = ["gkrust-shared/simd-accel"]
+ no-static-ideograph-encoder-tables = ["gkrust-shared/no-static-ideograph-encoder-tables"]
+-oom_with_global_alloc = ["gkrust-shared/oom_with_global_alloc"]
+-oom_with_hook = ["gkrust-shared/oom_with_hook"]
+ 
+ [dependencies]
+ mp4parse-gtest = { path = "../../../../dom/media/gtest" }
+ nsstring-gtest = { path = "../../../../xpcom/rust/gtest/nsstring" }
+ xpcom-gtest = { path = "../../../../xpcom/rust/gtest/xpcom" }
+ gkrust-shared = { path = "../../rust/shared" }
+ 
+ [lib]
+diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
+--- a/toolkit/library/rust/Cargo.toml
++++ b/toolkit/library/rust/Cargo.toml
+@@ -9,18 +9,16 @@ description = "Rust code for libxul"
+ bindgen = ["gkrust-shared/bindgen"]
+ servo = ["gkrust-shared/servo"]
+ quantum_render = ["gkrust-shared/quantum_render"]
+ cubeb-remoting = ["gkrust-shared/cubeb-remoting"]
+ cubeb_pulse_rust = ["gkrust-shared/cubeb_pulse_rust"]
+ gecko_debug = ["gkrust-shared/gecko_debug"]
+ simd-accel = ["gkrust-shared/simd-accel"]
+ no-static-ideograph-encoder-tables = ["gkrust-shared/no-static-ideograph-encoder-tables"]
+-oom_with_global_alloc = ["gkrust-shared/oom_with_global_alloc"]
+-oom_with_hook = ["gkrust-shared/oom_with_hook"]
+ 
+ [dependencies]
+ gkrust-shared = { path = "shared" }
+ 
+ [dev-dependencies]
+ stylo_tests = { path = "../../../servo/ports/geckolib/tests/" }
+ 
+ [lib]
+diff --git a/toolkit/library/rust/gkrust-features.mozbuild b/toolkit/library/rust/gkrust-features.mozbuild
+--- a/toolkit/library/rust/gkrust-features.mozbuild
++++ b/toolkit/library/rust/gkrust-features.mozbuild
+@@ -24,20 +24,8 @@ if CONFIG['MOZ_RUST_SIMD']:
+     gkrust_features += ['simd-accel']
+ 
+ # This feature is only supported on Linux and macOS, and this check needs to
+ # match MOZ_CUBEB_REMOTING in CubebUtils.cpp.
+ if (CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android') or CONFIG['OS_ARCH'] == 'Darwin':
+     gkrust_features += ['cubeb-remoting']
+ 
+ gkrust_features += ['no-static-ideograph-encoder-tables']
+-
+-# See details in toolkit/library/rust/shared/lib.rs
+-# A string test is not the best thing, but it works well enough here.
+-if CONFIG['RUSTC_VERSION'] < "1.27":
+-    gkrust_features += ['oom_with_global_alloc']
+-elif CONFIG['RUSTC_VERSION'] >= "1.28" and CONFIG['RUSTC_VERSION'] < "1.29":
+-    gkrust_features += ['oom_with_hook']
+-elif CONFIG['MOZ_AUTOMATION']:
+-    # We don't want builds on automation to unwittingly stop annotating OOM
+-    # crash reports from rust.
+-    error('Builds on automation must use a version of rust that supports OOM '
+-          'hooking')
+diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
+--- a/toolkit/library/rust/shared/Cargo.toml
++++ b/toolkit/library/rust/shared/Cargo.toml
+@@ -37,18 +37,16 @@ default = []
+ bindgen = ["geckoservo/bindgen"]
+ servo = ["geckoservo"]
+ quantum_render = ["webrender_bindings"]
+ cubeb-remoting = ["cubeb-sys", "audioipc-client", "audioipc-server"]
+ cubeb_pulse_rust = ["cubeb-sys", "cubeb-pulse"]
+ gecko_debug = ["geckoservo/gecko_debug", "nsstring/gecko_debug"]
+ simd-accel = ["encoding_c/simd-accel", "encoding_glue/simd-accel"]
+ no-static-ideograph-encoder-tables = ["encoding_c/no-static-ideograph-encoder-tables", "encoding_glue/no-static-ideograph-encoder-tables"]
+-oom_with_global_alloc = []
+-oom_with_hook = []
+ 
+ [lib]
+ path = "lib.rs"
+ test = false
+ doctest = false
+ bench = false
+ doc = false
+ plugin = false
+diff --git a/toolkit/library/rust/shared/build.rs b/toolkit/library/rust/shared/build.rs
+--- a/toolkit/library/rust/shared/build.rs
++++ b/toolkit/library/rust/shared/build.rs
+@@ -1,8 +1,25 @@
++extern crate rustc_version;
++
++use rustc_version::{version, Version};
++
+ fn main() {
++    let ver = version().unwrap();
++    let mut bootstrap = false;
++
++    if ver >= Version::parse("1.24.0").unwrap() && ver < Version::parse("1.27.0").unwrap() {
++        println!("cargo:rustc-cfg=feature=\"oom_with_global_alloc\"");
++        bootstrap = true;
++    } else if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < Version::parse("1.29.0").unwrap() {
++        println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");
++        bootstrap = true;
++    } else if std::env::var("MOZ_AUTOMATION").is_ok() {
++        panic!("Builds on automation must use a version of rust that supports OOM hooking")
++    }
++
+     // This is a rather awful thing to do, but we're only doing it on
+-    // versions of rustc, >= 1.24 < 1.27, that are not going to change
+-    // the unstable APIs we use from under us (1.26 being a beta as of
+-    // writing, and close to release).
+-    #[cfg(any(feature = "oom_with_global_alloc", feature = "oom_with_hook"))]
+-    println!("cargo:rustc-env=RUSTC_BOOTSTRAP=1");
++    // versions of rustc that are not going to change the unstable APIs
++    // we use from under us, all being already released or beta.
++    if bootstrap {
++        println!("cargo:rustc-env=RUSTC_BOOTSTRAP=1");
++    }
+ }

rel-257/mozilla-esr60/patches/series

@@ -108,3 +108,7 @@
 1602259-2-VS2019-gyp-60.patch
 1602263-watchman-60.patch
 1602263-fixbuild-60.patch
+1465709-1-62a1.patch
+1465709-2-62a1.patch
+1471096-1-63a1.patch
+1471096-2-63a1.patch