From a35596ed6389b3fd918ebe8f7c6d20b9bc2e8f0d Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Wed, 2 Oct 2019 03:05:50 +0000
Subject: [PATCH] servo: Merge #18939 - Bump various FFI crates to get
 jobserver support (from servo:muh-parallelism); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 6f52b331b8c6c38405964cdeacbc9f771c70b18c

UltraBlame original commit: c2cc48e53c545d5782b952b0eb57c4c34ceb90d9
---
 servo/Cargo.lock | 122 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 99 insertions(+), 23 deletions(-)

diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 073eb0e08a32d..30f808693f16a 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -4329,6 +4329,48 @@ package
 name
 =
 "
+cc
+"
+version
+=
+"
+1
+.
+0
+.
+1
+"
+source
+=
+"
+registry
++
+https
+:
+/
+/
+github
+.
+com
+/
+rust
+-
+lang
+/
+crates
+.
+io
+-
+index
+"
+[
+[
+package
+]
+]
+name
+=
+"
 cexpr
 "
 version
@@ -13804,7 +13846,7 @@ sys
 .
 1
 .
-14
+15
 (
 registry
 +
@@ -15157,7 +15199,7 @@ src
 .
 3
 .
-0
+1
 -
 devel
 (
@@ -15662,7 +15704,7 @@ version
 .
 1
 .
-14
+15
 "
 source
 =
@@ -21698,7 +21740,7 @@ version
 .
 0
 .
-16
+18
 "
 source
 =
@@ -21727,12 +21769,12 @@ dependencies
 =
 [
 "
-gcc
-0
+cc
+1
 .
-3
+0
 .
-47
+1
 (
 registry
 +
@@ -24229,7 +24271,7 @@ servo
 /
 mozjs
 #
-834ce35c3f008010213351107b68f397989d2ffd
+424067c8d176bf1ee4c7f90c56916d35542de672
 "
 dependencies
 =
@@ -24271,7 +24313,7 @@ sys
 .
 0
 .
-16
+18
 (
 registry
 +
@@ -28814,7 +28856,7 @@ version
 .
 3
 .
-0
+1
 -
 devel
 "
@@ -28837,7 +28879,7 @@ osmesa
 -
 src
 #
-100789c549a5716773a74a5db0a2e929470e2c9f
+6d23daede16f7edf7c66bdcce73c7583d0853733
 "
 [
 [
@@ -37076,7 +37118,7 @@ sys
 .
 0
 .
-3
+4
 (
 registry
 +
@@ -37121,7 +37163,7 @@ version
 .
 0
 .
-3
+4
 "
 source
 =
@@ -38296,7 +38338,7 @@ sys
 .
 0
 .
-3
+4
 (
 registry
 +
@@ -45481,7 +45523,7 @@ sys
 .
 1
 .
-14
+15
 (
 registry
 +
@@ -51007,6 +51049,40 @@ index
 "
 "
 checksum
+cc
+1
+.
+0
+.
+1
+(
+registry
++
+https
+:
+/
+/
+github
+.
+com
+/
+rust
+-
+lang
+/
+crates
+.
+io
+-
+index
+)
+"
+=
+"
+2c674f0870e3dbd4105184ea035acb1c32c8ae69939c9e228d2b11bbfe29efad
+"
+"
+checksum
 cexpr
 0
 .
@@ -53486,7 +53562,7 @@ sys
 .
 1
 .
-14
+15
 (
 registry
 +
@@ -53511,7 +53587,7 @@ index
 "
 =
 "
-a2caaa66078fdfacea32db1351223697a1167ad2d4bbee6b8d4ca220ce5b10b3
+52aa65c5649a0a2f1b27ab30093b3cc84681e17ddb552267e21948c5a6fa6b05
 "
 "
 checksum
@@ -54596,7 +54672,7 @@ sys
 .
 0
 .
-16
+18
 (
 registry
 +
@@ -54621,7 +54697,7 @@ index
 "
 =
 "
-3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8
+87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16
 "
 "
 checksum
@@ -55904,7 +55980,7 @@ src
 .
 3
 .
-0
+1
 -
 devel
 (
@@ -57546,7 +57622,7 @@ sys
 .
 0
 .
-3
+4
 (
 registry
 +
@@ -57571,7 +57647,7 @@ index
 "
 =
 "
-6be80777ee6edecbbbf8774c76e19dddfe336256c57a4ded06d6ad3df7be358e
+38b494f03009ee81914b0e7d387ad7c145cafcd69747c2ec89b0e17bb94f303a
 "
 "
 checksum