diff options
author | bors-servo <servo-ops@mozilla.com> | 2020-03-30 23:51:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-30 23:51:47 -0400 |
commit | 42463c4c4419a27e1779647cebf115bc8b31bd36 (patch) | |
tree | a8c4fada8d6c668bf2440bdc52b1c55795cbdbfa /components | |
parent | 029049b48630f426ac5face4d9a9c0cd5195c66c (diff) | |
parent | 33ddf3eef356c1b2b17a4427b101977dc22270c9 (diff) | |
download | servo-42463c4c4419a27e1779647cebf115bc8b31bd36.tar.gz servo-42463c4c4419a27e1779647cebf115bc8b31bd36.zip |
Auto merge of #26062 - jdm:jsup, r=Manishearth
Update mozjs.
Fix #26040. Incorporate upstream patches to improve JIT codegen on arm64.
Diffstat (limited to 'components')
-rw-r--r-- | components/script/Cargo.toml | 1 | ||||
-rw-r--r-- | components/servo/Cargo.toml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 7cdc2e1809a..d6767355f9e 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -21,7 +21,6 @@ webgl_backtrace = ["backtrace", "canvas_traits/webgl_backtrace"] js_backtrace = ["backtrace"] refcell_backtrace = ["accountable-refcell"] uwp = ["js/uwp"] -vslatestinstalled = ["js/vslatestinstalled"] xr-profile = ["webxr-api/profile"] [build-dependencies] diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index ffcb3b83f2c..22cadd371fa 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -34,7 +34,6 @@ webgl_backtrace = [ "canvas/webgl_backtrace", "canvas_traits/webgl_backtrace", ] -vslatestinstalled = ["script/vslatestinstalled"] media-dummy = ["servo-media-dummy"] media-gstreamer = ["servo-media-gstreamer", "gstreamer"] xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"] |