aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-12-29 17:58:41 -0500
committerGitHub <noreply@github.com>2020-12-29 17:58:41 -0500
commitbe19c03d967b4ec94eec86d1241b6e694ba857da (patch)
treeb13ae8b049636f9611a06910b2335262b11c9033
parenta10a95fba69d6d755d200b67b874bf117046dd51 (diff)
parentb1c6f4683e67d4a75bd50cb91fde8f5c5809bddf (diff)
downloadservo-be19c03d967b4ec94eec86d1241b6e694ba857da.tar.gz
servo-be19c03d967b4ec94eec86d1241b6e694ba857da.zip
Auto merge of #28001 - avr1:master, r=jdm
Updated to support macOS 11.1 <!-- Please describe your changes on the following line: --> Updated Cargo.lock to contain the latest version of the rust-mozjs crate, which supports macOS 11.1 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because it adds supported files. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rw-r--r--Cargo.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 7528a3deb59..2eb05fd8922 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3786,7 +3786,7 @@ dependencies = [
[[package]]
name = "mozjs"
version = "0.14.1"
-source = "git+https://github.com/servo/rust-mozjs#e9f71b6458135c1e63fee9261dabcd8c3efa6ccf"
+source = "git+https://github.com/servo/rust-mozjs#db90a4651adcc1447d1eb8c4bb13f18ea957d263"
dependencies = [
"cc",
"lazy_static",
@@ -3799,7 +3799,7 @@ dependencies = [
[[package]]
name = "mozjs_sys"
version = "0.68.2"
-source = "git+https://github.com/servo/mozjs?rev=a40b829f0fefa06a743f006260c7facebcfa27aa#a40b829f0fefa06a743f006260c7facebcfa27aa"
+source = "git+https://github.com/servo/mozjs?rev=26a1e8afdb21beec33373ef2a38131272d064bdd#26a1e8afdb21beec33373ef2a38131272d064bdd"
dependencies = [
"bindgen",
"cc",