Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update rand to 0.7 (fixes #24448)

Browse source
This commit is contained in:
Anthony Ramine 2019-10-16 14:07:39 +02:00
parent 4f8cfd9b48
commit 785a344e32
42 changed files with 200 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

266
Cargo.lock generated
View file

@ -148,11 +148,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "autocfg"
version = "0.1.6"
source = "git+https://github.com/servo/autocfg?branch=rustflags2#9142612f4b2599e6a858dc32cd3cbda5c98bd651"
[[package]] [[package]]
name = "azure" name = "azure"
version = "0.37.0" version = "0.37.0"
@ -426,6 +421,16 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "c2-chacha"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
dependencies = [
"lazy_static",
"ppv-lite86",
]
[[package]] [[package]]
name = "canvas" name = "canvas"
version = "0.0.1" version = "0.0.1"
@ -872,18 +877,16 @@ dependencies = [
[[package]] [[package]]
name = "cssparser" name = "cssparser"
version = "0.25.9" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbe18ca4efb9ba3716c6da66cc3d7e673bf59fa576353011f48c4cfddbdd740e" checksum = "dc63bba4f652956b1afadd4e21c52e76b7dd4f7aefb9e79db8611d0726a9d354"
dependencies = [ dependencies = [
"autocfg",
"cssparser-macros", "cssparser-macros",
"dtoa-short", "dtoa-short",
"itoa", "itoa",
"matches", "matches",
"phf", "phf",
"proc-macro2 1.0.1", "proc-macro2 1.0.1",
"procedural-masquerade",
"quote 1.0.2", "quote 1.0.2",
"serde", "serde",
"smallvec", "smallvec",
@ -892,13 +895,10 @@ dependencies = [
[[package]] [[package]]
name = "cssparser-macros" name = "cssparser-macros"
version = "0.3.6" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bb1c84e87c717666564ec056105052331431803d606bd45529b28547b611eef" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
dependencies = [ dependencies = [
"phf_codegen",
"proc-macro2 1.0.1",
"procedural-masquerade",
"quote 1.0.2", "quote 1.0.2",
"syn 1.0.3", "syn 1.0.3",
] ]
@ -1399,12 +1399,6 @@ dependencies = [
"servo-freetype-sys", "servo-freetype-sys",
] ]
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]] [[package]]
name = "fuchsia-zircon" name = "fuchsia-zircon"
version = "0.3.3" version = "0.3.3"
@ -1458,12 +1452,12 @@ dependencies = [
[[package]] [[package]]
name = "gaol" name = "gaol"
version = "0.2.0" version = "0.2.1"
source = "git+https://github.com/servo/gaol#e26c5a5dd53c0745bb1e27f3bccdeb6cf306a17d" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "061957ca7a966a39a79ebca393a9a6c7babda10bf9dd6f11d00041558d929c22"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
"rand",
] ]
[[package]] [[package]]
@ -2108,9 +2102,9 @@ checksum = "1bdcec4094c1ca961b685384ea7af76af5718230b3f34657d1a71fd2dcf4cc9d"
[[package]] [[package]]
name = "html5ever" name = "html5ever"
version = "0.24.1" version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb" checksum = "61072e237173349e0a04d09e6e17178315dbf8135a07b034dd4ac72f4293d97f"
dependencies = [ dependencies = [
"log", "log",
"mac", "mac",
@ -2322,9 +2316,9 @@ dependencies = [
[[package]] [[package]]
name = "ipc-channel" name = "ipc-channel"
version = "0.12.0" version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79d98ee7dd1d2e796d254807fd86ea7189d07571aeaa74007603e29a79d15217" checksum = "5172208c1dfd469c409af6d159bd9137ce463285a978b7fad464518edd8ee3f8"
dependencies = [ dependencies = [
"bincode", "bincode",
"crossbeam-channel", "crossbeam-channel",
@ -2893,9 +2887,9 @@ dependencies = [
[[package]] [[package]]
name = "markup5ever" name = "markup5ever"
version = "0.9.0" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" checksum = "aae38d669396ca9b707bfc3db254bc382ddb94f57cc5c235f34623a669a01dab"
dependencies = [ dependencies = [
"log", "log",
"phf", "phf",
@ -2910,9 +2904,9 @@ dependencies = [
[[package]] [[package]]
name = "matches" name = "matches"
version = "0.1.4" version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]] [[package]]
name = "media" name = "media"
@ -3595,18 +3589,20 @@ dependencies = [
[[package]] [[package]]
name = "phf" name = "phf"
version = "0.7.24" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [ dependencies = [
"phf_macros",
"phf_shared", "phf_shared",
"proc-macro-hack",
] ]
[[package]] [[package]]
name = "phf_codegen" name = "phf_codegen"
version = "0.7.24" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
dependencies = [ dependencies = [
"phf_generator", "phf_generator",
"phf_shared", "phf_shared",
@ -3614,19 +3610,33 @@ dependencies = [
[[package]] [[package]]
name = "phf_generator" name = "phf_generator"
version = "0.7.24" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [ dependencies = [
"phf_shared", "phf_shared",
"rand", "rand",
] ]
[[package]] [[package]]
name = "phf_shared" name = "phf_macros"
version = "0.7.24" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
dependencies = [
"phf_generator",
"phf_shared",
"proc-macro-hack",
"proc-macro2 1.0.1",
"quote 1.0.2",
"syn 1.0.3",
]
[[package]]
name = "phf_shared"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
dependencies = [ dependencies = [
"siphasher", "siphasher",
] ]
@ -3677,6 +3687,12 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" checksum = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd"
[[package]]
name = "ppv-lite86"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
[[package]] [[package]]
name = "precomputed-hash" name = "precomputed-hash"
version = "0.1.1" version = "0.1.1"
@ -3790,106 +3806,62 @@ dependencies = [
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.6.5" version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
dependencies = [ dependencies = [
"autocfg", "getrandom",
"libc", "libc",
"rand_chacha", "rand_chacha",
"rand_core 0.4.2", "rand_core",
"rand_hc", "rand_hc",
"rand_isaac",
"rand_jitter",
"rand_os",
"rand_pcg", "rand_pcg",
"rand_xorshift",
"winapi",
] ]
[[package]] [[package]]
name = "rand_chacha" name = "rand_chacha"
version = "0.1.1" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
dependencies = [ dependencies = [
"autocfg", "c2-chacha",
"rand_core 0.3.1", "rand_core",
] ]
[[package]] [[package]]
name = "rand_core" name = "rand_core"
version = "0.3.1" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [ dependencies = [
"rand_core 0.4.2", "getrandom",
] ]
[[package]]
name = "rand_core"
version = "0.4.2"
source = "git+https://github.com/servo/rand?branch=servo-rand_os-0.1.3-uwp#13b836653183635c0bae3171a63f6faaf6d41809"
[[package]] [[package]]
name = "rand_hc" name = "rand_hc"
version = "0.1.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [ dependencies = [
"rand_core 0.3.1", "rand_core",
] ]
[[package]] [[package]]
name = "rand_isaac" name = "rand_isaac"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" checksum = "8df6b0b3dc9991a10b2d91a86d1129314502169a1bf6afa67328945e02498b76"
dependencies = [ dependencies = [
"rand_core 0.3.1", "rand_core",
]
[[package]]
name = "rand_jitter"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
dependencies = [
"libc",
"rand_core 0.4.2",
"winapi",
]
[[package]]
name = "rand_os"
version = "0.1.3"
source = "git+https://github.com/servo/rand?branch=servo-rand_os-0.1.3-uwp#13b836653183635c0bae3171a63f6faaf6d41809"
dependencies = [
"cloudabi",
"fuchsia-cprng",
"libc",
"rand_core 0.4.2",
"rdrand",
"winapi",
] ]
[[package]] [[package]]
name = "rand_pcg" name = "rand_pcg"
version = "0.1.2" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
dependencies = [ dependencies = [
"autocfg", "rand_core",
"rand_core 0.4.2",
]
[[package]]
name = "rand_xorshift"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
dependencies = [
"rand_core 0.3.1",
] ]
[[package]] [[package]]
@ -3949,15 +3921,6 @@ dependencies = [
"rayon", "rayon",
] ]
[[package]]
name = "rdrand"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
dependencies = [
"rand_core 0.3.1",
]
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.1.17" version = "0.1.17"
@ -4469,7 +4432,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media" name = "servo-media"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"servo-media-audio", "servo-media-audio",
"servo-media-player", "servo-media-player",
@ -4481,7 +4444,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-audio" name = "servo-media-audio"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"byte-slice-cast", "byte-slice-cast",
@ -4498,7 +4461,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-dummy" name = "servo-media-dummy"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"ipc-channel", "ipc-channel",
@ -4513,7 +4476,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer" name = "servo-media-gstreamer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"byte-slice-cast", "byte-slice-cast",
@ -4549,7 +4512,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer-render" name = "servo-media-gstreamer-render"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"gstreamer", "gstreamer",
"gstreamer-video", "gstreamer-video",
@ -4559,7 +4522,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer-render-android" name = "servo-media-gstreamer-render-android"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"glib", "glib",
"gstreamer", "gstreamer",
@ -4572,7 +4535,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-gstreamer-render-unix" name = "servo-media-gstreamer-render-unix"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"glib", "glib",
"gstreamer", "gstreamer",
@ -4585,7 +4548,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-player" name = "servo-media-player"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"ipc-channel", "ipc-channel",
"serde", "serde",
@ -4597,7 +4560,7 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-streams" name = "servo-media-streams"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"uuid", "uuid",
@ -4606,12 +4569,12 @@ dependencies = [
[[package]] [[package]]
name = "servo-media-traits" name = "servo-media-traits"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
[[package]] [[package]]
name = "servo-media-webrtc" name = "servo-media-webrtc"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"boxfnonce", "boxfnonce",
"log", "log",
@ -4708,7 +4671,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_media_derive" name = "servo_media_derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc" source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.1",
"quote 1.0.2", "quote 1.0.2",
@ -4722,7 +4685,7 @@ dependencies = [
"lazy_static", "lazy_static",
"log", "log",
"rand", "rand",
"rand_core 0.4.2", "rand_core",
"rand_isaac", "rand_isaac",
"uuid", "uuid",
] ]
@ -4849,9 +4812,9 @@ dependencies = [
[[package]] [[package]]
name = "siphasher" name = "siphasher"
version = "0.2.2" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537" checksum = "83da420ee8d1a89e640d0948c646c1c088758d3a3c538f943bfa97bdac17929d"
[[package]] [[package]]
name = "size_of_test" name = "size_of_test"
@ -4949,38 +4912,29 @@ dependencies = [
[[package]] [[package]]
name = "string_cache" name = "string_cache"
version = "0.7.3" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423" checksum = "2940c75beb4e3bf3a494cef919a747a2cb81e52571e212bfbd185074add7208a"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"new_debug_unreachable", "new_debug_unreachable",
"phf_shared", "phf_shared",
"precomputed-hash", "precomputed-hash",
"serde", "serde",
"string_cache_codegen",
"string_cache_shared",
] ]
[[package]] [[package]]
name = "string_cache_codegen" name = "string_cache_codegen"
version = "0.4.2" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da" checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
dependencies = [ dependencies = [
"phf_generator", "phf_generator",
"phf_shared", "phf_shared",
"proc-macro2 0.4.26", "proc-macro2 1.0.1",
"quote 0.6.12", "quote 1.0.2",
"string_cache_shared",
] ]
[[package]]
name = "string_cache_shared"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.7.0" version = "0.7.0"
@ -5181,9 +5135,9 @@ dependencies = [
[[package]] [[package]]
name = "tempfile" name = "tempfile"
version = "3.0.8" version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
@ -5370,9 +5324,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-executor" name = "tokio-executor"
version = "0.1.7" version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e" checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac"
dependencies = [ dependencies = [
"crossbeam-utils", "crossbeam-utils",
"futures", "futures",
@ -5451,17 +5405,17 @@ dependencies = [
[[package]] [[package]]
name = "tokio-threadpool" name = "tokio-threadpool"
version = "0.1.14" version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2" checksum = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c"
dependencies = [ dependencies = [
"crossbeam-deque", "crossbeam-deque",
"crossbeam-queue", "crossbeam-queue",
"crossbeam-utils", "crossbeam-utils",
"futures", "futures",
"lazy_static",
"log", "log",
"num_cpus", "num_cpus",
"rand",
"slab", "slab",
"tokio-executor", "tokio-executor",
] ]
@ -5675,9 +5629,9 @@ checksum = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "0.7.4" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" checksum = "bf1d83e5fa94e6c54ee47351bc92daca1f386aa1529ffbb668d2cee5e8173013"
dependencies = [ dependencies = [
"rand", "rand",
"serde", "serde",
@ -6103,9 +6057,9 @@ dependencies = [
[[package]] [[package]]
name = "ws" name = "ws"
version = "0.9.0" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a6f5bb86663ff4d1639408410f50bf6050367a8525d644d49a6894cd618a631" checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"bytes", "bytes",
@ -6180,9 +6134,9 @@ checksum = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
[[package]] [[package]]
name = "xml5ever" name = "xml5ever"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b93ca59bfbbc3c0f807a61faea54e6a4c753f82857d3730e9afb5523b6149c7" checksum = "33f9cd1d3587e33237f1716ace767fbddd62405096305c57430369cb7263d32f"
dependencies = [ dependencies = [
"log", "log",
"mac", "mac",

4
Cargo.toml
View file

@ -27,9 +27,5 @@ opt-level = 3
# Those are here to dedupe winapi since mio is still using winapi 0.2. # Those are here to dedupe winapi since mio is still using winapi 0.2.
mio = { git = "https://github.com/servo/mio.git", branch = "servo" } mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
rand_os = { git = "https://github.com/servo/rand", branch = "servo-rand_os-0.1.3-uwp" }
rand_core = { git = "https://github.com/servo/rand", branch = "servo-rand_os-0.1.3-uwp" }
# https://github.com/cuviper/autocfg/pull/10
autocfg = { git = "https://github.com/servo/autocfg", branch = "rustflags2" }
# https://github.com/retep998/winapi-rs/pull/816 # https://github.com/retep998/winapi-rs/pull/816
winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" } winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }

4
components/atoms/Cargo.toml
View file

@ -11,7 +11,7 @@ build = "build.rs"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
string_cache = {version = "0.7"} string_cache = "0.8"
[build-dependencies] [build-dependencies]
string_cache_codegen = "0.4" string_cache_codegen = "0.5"

2
components/bluetooth/Cargo.toml
View file

@ -19,7 +19,7 @@ ipc-channel = "0.12"
log = "0.4" log = "0.4"
servo_config = {path = "../config"} servo_config = {path = "../config"}
servo_rand = {path = "../rand"} servo_rand = {path = "../rand"}
uuid = {version = "0.7", features = ["v4"]} uuid = {version = "0.8", features = ["v4"]}
[features] [features]
native-bluetooth = ["device/bluetooth"] native-bluetooth = ["device/bluetooth"]

2
components/canvas/Cargo.toml
View file

@ -20,7 +20,7 @@ no_wgl = ["offscreen_gl_context/no_wgl"]
azure = {git = "https://github.com/servo/rust-azure", optional = true} azure = {git = "https://github.com/servo/rust-azure", optional = true}
byteorder = "1" byteorder = "1"
canvas_traits = {path = "../canvas_traits"} canvas_traits = {path = "../canvas_traits"}
cssparser = "0.25" cssparser = "0.27.1"
embedder_traits = {path = "../embedder_traits"} embedder_traits = {path = "../embedder_traits"}
euclid = "0.20" euclid = "0.20"
fnv = "1.0" fnv = "1.0"

2
components/canvas_traits/Cargo.toml
View file

@ -14,7 +14,7 @@ path = "lib.rs"
webgl_backtrace = [] webgl_backtrace = []
[dependencies] [dependencies]
cssparser = "0.25" cssparser = "0.27.1"
euclid = "0.20" euclid = "0.20"
ipc-channel = "0.12" ipc-channel = "0.12"
lazy_static = "1" lazy_static = "1"

2
components/constellation/Cargo.toml
View file

@ -53,4 +53,4 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]} webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies] [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"} gaol = "0.2.1"

2
components/devtools/Cargo.toml
View file

@ -22,4 +22,4 @@ msg = {path = "../msg"}
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
time = "0.1" time = "0.1"
uuid = {version = "0.7", features = ["v4"]} uuid = {version = "0.8", features = ["v4"]}

2
components/hashglobe/Cargo.toml
View file

@ -13,4 +13,4 @@ readme = "README.md"
libc = "0.2" libc = "0.2"
[dev-dependencies] [dev-dependencies]
rand = "0.6" rand = "0.7"

2
components/layout/Cargo.toml
View file

@ -24,7 +24,7 @@ fnv = "1.0"
fxhash = "0.2" fxhash = "0.2"
gfx = {path = "../gfx"} gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"} gfx_traits = {path = "../gfx_traits"}
html5ever = "0.24" html5ever = "0.25"
ipc-channel = "0.12" ipc-channel = "0.12"
lazy_static = "1" lazy_static = "1"
libc = "0.2" libc = "0.2"

2
components/layout_thread/Cargo.toml
View file

@ -21,7 +21,7 @@ fxhash = "0.2"
gfx = {path = "../gfx"} gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"} gfx_traits = {path = "../gfx_traits"}
histogram = "0.6.8" histogram = "0.6.8"
html5ever = "0.24" html5ever = "0.25"
ipc-channel = "0.12" ipc-channel = "0.12"
layout = {path = "../layout", package = "layout_2013"} layout = {path = "../layout", package = "layout_2013"}
layout_traits = {path = "../layout_traits"} layout_traits = {path = "../layout_traits"}

2
components/layout_thread_2020/Cargo.toml
View file

@ -20,7 +20,7 @@ fnv = "1.0"
fxhash = "0.2" fxhash = "0.2"
gfx = {path = "../gfx"} gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"} gfx_traits = {path = "../gfx_traits"}
html5ever = "0.24" html5ever = "0.25"
ipc-channel = "0.12" ipc-channel = "0.12"
layout = {path = "../layout_2020", package = "layout_2020"} layout = {path = "../layout_2020", package = "layout_2020"}
layout_traits = {path = "../layout_traits"} layout_traits = {path = "../layout_traits"}

6
components/malloc_size_of/Cargo.toml
View file

@ -28,7 +28,7 @@ servo = [
app_units = "0.7" app_units = "0.7"
content-security-policy = {version = "0.3.0", features = ["serde"], optional = true} content-security-policy = {version = "0.3.0", features = ["serde"], optional = true}
crossbeam-channel = { version = "0.3", optional = true } crossbeam-channel = { version = "0.3", optional = true }
cssparser = "0.25" cssparser = "0.27.1"
euclid = "0.20" euclid = "0.20"
hashglobe = { path = "../hashglobe" } hashglobe = { path = "../hashglobe" }
hyper = { version = "0.12", optional = true } hyper = { version = "0.12", optional = true }
@ -40,10 +40,10 @@ serde_bytes = { version = "0.10", optional = true }
servo_arc = { path = "../servo_arc" } servo_arc = { path = "../servo_arc" }
smallbitvec = "2.3.0" smallbitvec = "2.3.0"
smallvec = "0.6" smallvec = "0.6"
string_cache = { version = "0.7", optional = true } string_cache = { version = "0.8", optional = true }
thin-slice = "0.1.0" thin-slice = "0.1.0"
time = { version = "0.1.17", optional = true } time = { version = "0.1.17", optional = true }
url = { version = "2.0", optional = true } url = { version = "2.0", optional = true }
webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true } webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true }
xml5ever = { version = "0.15", optional = true } xml5ever = { version = "0.16", optional = true }
void = "1.0.2" void = "1.0.2"

2
components/net/Cargo.toml
View file

@ -55,7 +55,7 @@ servo_url = {path = "../url"}
tokio = "0.1" tokio = "0.1"
time = "0.1.17" time = "0.1.17"
url = "2.0" url = "2.0"
uuid = {version = "0.7", features = ["v4"]} uuid = {version = "0.8", features = ["v4"]}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
ws = { version = "0.9", features = ["ssl"] } ws = { version = "0.9", features = ["ssl"] }

2
components/net_traits/Cargo.toml
View file

@ -36,7 +36,7 @@ servo_arc = {path = "../servo_arc"}
servo_url = {path = "../url"} servo_url = {path = "../url"}
time = "0.1" time = "0.1"
url = "2.0" url = "2.0"
uuid = {version = "0.7", features = ["v4", "serde"]} uuid = {version = "0.8", features = ["v4", "serde"]}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
[dev-dependencies] [dev-dependencies]

8
components/rand/Cargo.toml
View file

@ -13,7 +13,7 @@ path = "lib.rs"
[dependencies] [dependencies]
lazy_static = "1" lazy_static = "1"
log = "0.4" log = "0.4"
rand = "0.6" rand = "0.7"
rand_core = "0.4" rand_core = "0.5"
rand_isaac = "0.1" rand_isaac = "0.2"
uuid = "0.7" uuid = "0.8"

5
components/rand/lib.rs
View file

@ -31,10 +31,7 @@ use uuid::{Builder, Uuid, Variant, Version};
// The shared RNG which may hold on to a file descriptor // The shared RNG which may hold on to a file descriptor
lazy_static! { lazy_static! {
static ref OS_RNG: Mutex<OsRng> = match OsRng::new() { static ref OS_RNG: Mutex<OsRng> = Mutex::new(OsRng);
Ok(r) => Mutex::new(r),
Err(e) => panic!("Failed to seed OsRng: {}", e),
};
} }
// Generate 32K of data between reseedings // Generate 32K of data between reseedings

14
components/script/Cargo.toml
View file

@ -23,8 +23,8 @@ uwp = ["js/uwp"]
vslatestinstalled = ["js/vslatestinstalled"] vslatestinstalled = ["js/vslatestinstalled"]
[build-dependencies] [build-dependencies]
phf_codegen = "0.7" phf_codegen = "0.8"
phf_shared = "0.7" phf_shared = "0.8"
serde_json = "1.0" serde_json = "1.0"
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
@ -43,7 +43,7 @@ content-security-policy = {version = "0.3.0", features = ["serde"]}
cookie = "0.11" cookie = "0.11"
chrono = "0.4" chrono = "0.4"
crossbeam-channel = "0.3" crossbeam-channel = "0.3"
cssparser = "0.25" cssparser = "0.27.1"
deny_public_fields = {path = "../deny_public_fields"} deny_public_fields = {path = "../deny_public_fields"}
devtools_traits = {path = "../devtools_traits"} devtools_traits = {path = "../devtools_traits"}
dom_struct = {path = "../dom_struct"} dom_struct = {path = "../dom_struct"}
@ -54,7 +54,7 @@ enum-iterator = "0.3"
euclid = "0.20" euclid = "0.20"
fnv = "1.0" fnv = "1.0"
headers = "0.2" headers = "0.2"
html5ever = "0.24" html5ever = "0.25"
http = "0.1" http = "0.1"
hyper = "0.12" hyper = "0.12"
hyper_serde = "0.11" hyper_serde = "0.11"
@ -80,7 +80,7 @@ net_traits = {path = "../net_traits"}
num-traits = "0.2" num-traits = "0.2"
parking_lot = "0.9" parking_lot = "0.9"
percent-encoding = "2.0" percent-encoding = "2.0"
phf = "0.7" phf = "0.8"
pixels = {path = "../pixels"} pixels = {path = "../pixels"}
profile_traits = {path = "../profile_traits"} profile_traits = {path = "../profile_traits"}
ref_filter_map = "1.0.1" ref_filter_map = "1.0.1"
@ -109,8 +109,8 @@ time = "0.1.12"
unicode-segmentation = "1.1.0" unicode-segmentation = "1.1.0"
url = "2.0" url = "2.0"
utf-8 = "0.7" utf-8 = "0.7"
uuid = {version = "0.7", features = ["v4"]} uuid = {version = "0.8", features = ["v4"]}
xml5ever = {version = "0.15"} xml5ever = "0.16"
webdriver = "0.40" webdriver = "0.40"
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr_traits = {path = "../webvr_traits"} webvr_traits = {path = "../webvr_traits"}

11
components/script/build.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use phf_shared; use phf_shared::{self, FmtConst};
use serde_json::{self, Value}; use serde_json::{self, Value};
use std::env; use std::env;
use std::fmt; use std::fmt;
@ -40,18 +40,17 @@ fn main() {
let mut phf = File::create(&phf).unwrap(); let mut phf = File::create(&phf).unwrap();
write!( write!(
&mut phf, &mut phf,
"pub static MAP: phf::Map<&'static [u8], fn(JSContext, HandleObject)> = " "pub static MAP: phf::Map<&'static [u8], fn(JSContext, HandleObject)> = {};\n",
map.build(),
) )
.unwrap(); .unwrap();
map.build(&mut phf).unwrap();
write!(&mut phf, ";\n").unwrap();
} }
#[derive(Eq, Hash, PartialEq)] #[derive(Eq, Hash, PartialEq)]
struct Bytes<'a>(&'a str); struct Bytes<'a>(&'a str);
impl<'a> fmt::Debug for Bytes<'a> { impl<'a> FmtConst for Bytes<'a> {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn fmt_const(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
// https://github.com/rust-lang/rust/issues/55223 // https://github.com/rust-lang/rust/issues/55223
// should technically be just `write!(formatter, "b\"{}\"", self.0) // should technically be just `write!(formatter, "b\"{}\"", self.0)
// but the referenced issue breaks promotion in the surrounding code // but the referenced issue breaks promotion in the surrounding code

12
components/script/dom/servoparser/prefetch.rs
View file

@ -97,7 +97,7 @@ impl TokenSink for PrefetchSink {
_ => return TokenSinkResult::Continue, _ => return TokenSinkResult::Continue,
}; };
match (tag.kind, &tag.name) { match (tag.kind, &tag.name) {
(TagKind::StartTag, local_name!("script")) if self.prefetching => { (TagKind::StartTag, &local_name!("script")) if self.prefetching => {
if let Some(url) = self.get_url(tag, local_name!("src")) { if let Some(url) = self.get_url(tag, local_name!("src")) {
debug!("Prefetch script {}", url); debug!("Prefetch script {}", url);
let cors_setting = self.get_cors_settings(tag, local_name!("crossorigin")); let cors_setting = self.get_cors_settings(tag, local_name!("crossorigin"));
@ -120,7 +120,7 @@ impl TokenSink for PrefetchSink {
} }
TokenSinkResult::RawData(RawKind::ScriptData) TokenSinkResult::RawData(RawKind::ScriptData)
}, },
(TagKind::StartTag, local_name!("img")) if self.prefetching => { (TagKind::StartTag, &local_name!("img")) if self.prefetching => {
if let Some(url) = self.get_url(tag, local_name!("src")) { if let Some(url) = self.get_url(tag, local_name!("src")) {
debug!("Prefetch {} {}", tag.name, url); debug!("Prefetch {} {}", tag.name, url);
let request = image_fetch_request( let request = image_fetch_request(
@ -137,7 +137,7 @@ impl TokenSink for PrefetchSink {
} }
TokenSinkResult::Continue TokenSinkResult::Continue
}, },
(TagKind::StartTag, local_name!("link")) if self.prefetching => { (TagKind::StartTag, &local_name!("link")) if self.prefetching => {
if let Some(rel) = self.get_attr(tag, local_name!("rel")) { if let Some(rel) = self.get_attr(tag, local_name!("rel")) {
if rel.value.eq_ignore_ascii_case("stylesheet") { if rel.value.eq_ignore_ascii_case("stylesheet") {
if let Some(url) = self.get_url(tag, local_name!("href")) { if let Some(url) = self.get_url(tag, local_name!("href")) {
@ -167,15 +167,15 @@ impl TokenSink for PrefetchSink {
} }
TokenSinkResult::Continue TokenSinkResult::Continue
}, },
(TagKind::StartTag, local_name!("script")) => { (TagKind::StartTag, &local_name!("script")) => {
TokenSinkResult::RawData(RawKind::ScriptData) TokenSinkResult::RawData(RawKind::ScriptData)
}, },
(TagKind::EndTag, local_name!("script")) => { (TagKind::EndTag, &local_name!("script")) => {
// After the first script tag, the main parser is blocked, so it's worth prefetching. // After the first script tag, the main parser is blocked, so it's worth prefetching.
self.prefetching = true; self.prefetching = true;
TokenSinkResult::Script(PrefetchHandle) TokenSinkResult::Script(PrefetchHandle)
}, },
(TagKind::StartTag, local_name!("base")) => { (TagKind::StartTag, &local_name!("base")) => {
if let Some(url) = self.get_url(tag, local_name!("href")) { if let Some(url) = self.get_url(tag, local_name!("href")) {
if self.base_url.is_none() { if self.base_url.is_none() {
debug!("Setting base {}", url); debug!("Setting base {}", url);

2
components/script_layout_interface/Cargo.toml
View file

@ -17,7 +17,7 @@ canvas_traits = {path = "../canvas_traits"}
crossbeam-channel = "0.3" crossbeam-channel = "0.3"
euclid = "0.20" euclid = "0.20"
gfx_traits = {path = "../gfx_traits"} gfx_traits = {path = "../gfx_traits"}
html5ever = "0.24" html5ever = "0.25"
ipc-channel = "0.12" ipc-channel = "0.12"
libc = "0.2" libc = "0.2"
malloc_size_of = { path = "../malloc_size_of" } malloc_size_of = { path = "../malloc_size_of" }

6
components/selectors/Cargo.toml
View file

@ -22,11 +22,11 @@ bench = []
[dependencies] [dependencies]
bitflags = "1.0" bitflags = "1.0"
matches = "0.1" matches = "0.1"
cssparser = "0.25" cssparser = "0.27.1"
derive_more = "0.13" derive_more = "0.13"
log = "0.4" log = "0.4"
fxhash = "0.2" fxhash = "0.2"
phf = "0.7" phf = "0.8"
precomputed-hash = "0.1" precomputed-hash = "0.1"
servo_arc = { version = "0.1", path = "../servo_arc" } servo_arc = { version = "0.1", path = "../servo_arc" }
smallvec = "0.6" smallvec = "0.6"
@ -35,4 +35,4 @@ to_shmem = { path = "../to_shmem" }
to_shmem_derive = { path = "../to_shmem_derive" } to_shmem_derive = { path = "../to_shmem_derive" }
[build-dependencies] [build-dependencies]
phf_codegen = "0.7" phf_codegen = "0.8"

9
components/selectors/build.rs
View file

@ -14,13 +14,16 @@ fn main() {
.join("ascii_case_insensitive_html_attributes.rs"); .join("ascii_case_insensitive_html_attributes.rs");
let mut file = BufWriter::new(File::create(&path).unwrap()); let mut file = BufWriter::new(File::create(&path).unwrap());
write!(&mut file, "{{ static SET: ::phf::Set<&'static str> = ").unwrap();
let mut set = phf_codegen::Set::new(); let mut set = phf_codegen::Set::new();
for name in ASCII_CASE_INSENSITIVE_HTML_ATTRIBUTES.split_whitespace() { for name in ASCII_CASE_INSENSITIVE_HTML_ATTRIBUTES.split_whitespace() {
set.entry(name); set.entry(name);
} }
set.build(&mut file).unwrap(); write!(
write!(&mut file, "; &SET }}").unwrap(); &mut file,
"{{ static SET: ::phf::Set<&'static str> = {}; &SET }}",
set.build(),
)
.unwrap();
} }
/// <https://html.spec.whatwg.org/multipage/#selectors> /// <https://html.spec.whatwg.org/multipage/#selectors>

2
components/servo/Cargo.toml
View file

@ -85,7 +85,7 @@ webvr_traits = {path = "../webvr_traits"}
webxr-api = {git = "https://github.com/servo/webxr"} webxr-api = {git = "https://github.com/servo/webxr"}
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies] [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"} gaol = "0.2.1"
[target.'cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows"))'.dependencies] [target.'cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows"))'.dependencies]
gstreamer = "0.14.5" gstreamer = "0.14.5"

6
components/style/Cargo.toml
View file

@ -33,7 +33,7 @@ arrayvec = "0.4.6"
atomic_refcell = "0.1" atomic_refcell = "0.1"
bitflags = "1.0" bitflags = "1.0"
byteorder = "1.0" byteorder = "1.0"
cssparser = "0.25" cssparser = "0.27.1"
crossbeam-channel = { version = "0.3", optional = true } crossbeam-channel = { version = "0.3", optional = true }
derive_more = "0.13" derive_more = "0.13"
new_debug_unreachable = "1.0" new_debug_unreachable = "1.0"
@ -42,7 +42,7 @@ euclid = "0.20"
fallible = { path = "../fallible" } fallible = { path = "../fallible" }
fxhash = "0.2" fxhash = "0.2"
hashglobe = { path = "../hashglobe" } hashglobe = { path = "../hashglobe" }
html5ever = {version = "0.24", optional = true} html5ever = {version = "0.25", optional = true}
indexmap = "1.0" indexmap = "1.0"
itertools = "0.8" itertools = "0.8"
itoa = "0.4" itoa = "0.4"
@ -67,7 +67,7 @@ servo_atoms = {path = "../atoms", optional = true}
servo_config = {path = "../config", optional = true} servo_config = {path = "../config", optional = true}
smallbitvec = "2.3.0" smallbitvec = "2.3.0"
smallvec = "0.6.6" smallvec = "0.6.6"
string_cache = { version = "0.7", optional = true } string_cache = { version = "0.8", optional = true }
style_derive = {path = "../style_derive"} style_derive = {path = "../style_derive"}
style_traits = {path = "../style_traits"} style_traits = {path = "../style_traits"}
servo_url = {path = "../url", optional = true} servo_url = {path = "../url", optional = true}

10
components/style/counter_style/mod.rs
View file

@ -220,9 +220,9 @@ macro_rules! counter_style_descriptors {
// rather than returning it. // rather than returning it.
let value = input.parse_entirely(|i| Parse::parse(self.context, i))?; let value = input.parse_entirely(|i| Parse::parse(self.context, i))?;
self.rule.$ident = Some(value) self.rule.$ident = Some(value)
} },
)* )*
_ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))) _ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))),
} }
Ok(()) Ok(())
} }
@ -371,11 +371,11 @@ impl Parse for System {
"fixed" => { "fixed" => {
let first_symbol_value = input.try(|i| Integer::parse(context, i)).ok(); let first_symbol_value = input.try(|i| Integer::parse(context, i)).ok();
Ok(System::Fixed { first_symbol_value }) Ok(System::Fixed { first_symbol_value })
} },
"extends" => { "extends" => {
let other = parse_counter_style_name(input)?; let other = parse_counter_style_name(input)?;
Ok(System::Extends(other)) Ok(System::Extends(other))
} },
} }
} }
} }
@ -652,7 +652,7 @@ impl Parse for SpeakAs {
"spell-out" => { "spell-out" => {
is_spell_out = true; is_spell_out = true;
Err(()) Err(())
} },
_ => Err(()), _ => Err(()),
} }
}); });

4
components/style/font_face.rs
View file

@ -480,9 +480,9 @@ macro_rules! font_face_descriptors_common {
// rather than returning it. // rather than returning it.
let value = input.parse_entirely(|i| Parse::parse(self.context, i))?; let value = input.parse_entirely(|i| Parse::parse(self.context, i))?;
self.rule.$ident = Some(value) self.rule.$ident = Some(value)
} },
)* )*
_ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))) _ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))),
} }
Ok(()) Ok(())
} }

4
components/style/servo/selector_parser.rs
View file

@ -460,8 +460,8 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
let pseudo_class = match_ignore_ascii_case! { &name, let pseudo_class = match_ignore_ascii_case! { &name,
"lang" => { "lang" => {
Lang(parser.expect_ident_or_string()?.as_ref().into()) Lang(parser.expect_ident_or_string()?.as_ref().into())
} },
_ => return Err(parser.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))) _ => return Err(parser.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))),
}; };
Ok(pseudo_class) Ok(pseudo_class)

10
components/style/stylesheets/document_rule.rs
View file

@ -144,28 +144,28 @@ impl DocumentMatchingFunction {
match_ignore_ascii_case! { &function, match_ignore_ascii_case! { &function,
"url-prefix" => { "url-prefix" => {
parse_quoted_or_unquoted_string!(input, DocumentMatchingFunction::UrlPrefix) parse_quoted_or_unquoted_string!(input, DocumentMatchingFunction::UrlPrefix)
} },
"domain" => { "domain" => {
parse_quoted_or_unquoted_string!(input, DocumentMatchingFunction::Domain) parse_quoted_or_unquoted_string!(input, DocumentMatchingFunction::Domain)
} },
"regexp" => { "regexp" => {
input.parse_nested_block(|input| { input.parse_nested_block(|input| {
Ok(DocumentMatchingFunction::Regexp( Ok(DocumentMatchingFunction::Regexp(
input.expect_string()?.as_ref().to_owned(), input.expect_string()?.as_ref().to_owned(),
)) ))
}) })
} },
"media-document" => { "media-document" => {
input.parse_nested_block(|input| { input.parse_nested_block(|input| {
let kind = MediaDocumentKind::parse(input)?; let kind = MediaDocumentKind::parse(input)?;
Ok(DocumentMatchingFunction::MediaDocument(kind)) Ok(DocumentMatchingFunction::MediaDocument(kind))
}) })
} },
_ => { _ => {
Err(location.new_custom_error( Err(location.new_custom_error(
StyleParseErrorKind::UnexpectedFunction(function.clone()) StyleParseErrorKind::UnexpectedFunction(function.clone())
)) ))
} },
} }
} }

2
components/style/stylesheets/rule_parser.rs
View file

@ -228,7 +228,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
"charset" => { "charset" => {
self.dom_error = Some(RulesMutateError::HierarchyRequest); self.dom_error = Some(RulesMutateError::HierarchyRequest);
return Err(input.new_custom_error(StyleParseErrorKind::UnexpectedCharsetRule)) return Err(input.new_custom_error(StyleParseErrorKind::UnexpectedCharsetRule))
} },
_ => {} _ => {}
} }

6
components/style/stylesheets/supports_rule.rs
View file

@ -157,17 +157,17 @@ impl SupportsCondition {
CString::new(name.as_bytes()) CString::new(name.as_bytes())
}.map_err(|_| input.new_custom_error(StyleParseErrorKind::UnspecifiedError))?; }.map_err(|_| input.new_custom_error(StyleParseErrorKind::UnspecifiedError))?;
Ok(SupportsCondition::MozBoolPref(name)) Ok(SupportsCondition::MozBoolPref(name))
} },
"selector" => { "selector" => {
let pos = input.position(); let pos = input.position();
consume_any_value(input)?; consume_any_value(input)?;
Ok(SupportsCondition::Selector(RawSelector( Ok(SupportsCondition::Selector(RawSelector(
input.slice_from(pos).to_owned() input.slice_from(pos).to_owned()
))) )))
} },
_ => { _ => {
Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)) Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
} },
} }
} }

2
components/style/values/specified/font.rs
View file

@ -229,7 +229,7 @@ impl Parse for SpecifiedFontStyle {
.unwrap_or_else(|_| Self::default_angle()); .unwrap_or_else(|_| Self::default_angle());
generics::FontStyle::Oblique(angle) generics::FontStyle::Oblique(angle)
} },
}) })
} }
} }

2
components/style/values/specified/image.rs
View file

@ -220,7 +220,7 @@ impl Parse for Gradient {
}, },
"-webkit-radial-gradient" => { "-webkit-radial-gradient" => {
Some((Shape::Radial, false, GradientCompatMode::WebKit)) Some((Shape::Radial, false, GradientCompatMode::WebKit))
} },
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
"-moz-radial-gradient" => { "-moz-radial-gradient" => {
Some((Shape::Radial, false, GradientCompatMode::Moz)) Some((Shape::Radial, false, GradientCompatMode::Moz))

10
components/style/values/specified/length.rs
View file

@ -471,17 +471,17 @@ impl NoCalcLength {
// viewport percentages // viewport percentages
"vw" if !context.in_page_rule() => { "vw" if !context.in_page_rule() => {
NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vw(value)) NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vw(value))
} },
"vh" if !context.in_page_rule() => { "vh" if !context.in_page_rule() => {
NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vh(value)) NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vh(value))
} },
"vmin" if !context.in_page_rule() => { "vmin" if !context.in_page_rule() => {
NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmin(value)) NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmin(value))
} },
"vmax" if !context.in_page_rule() => { "vmax" if !context.in_page_rule() => {
NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmax(value)) NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmax(value))
} },
_ => return Err(()) _ => return Err(()),
}) })
} }

2
components/style/values/specified/text.rs
View file

@ -421,7 +421,7 @@ impl Parse for TextTransform {
}, },
"full-size-kana" if !result.other_.intersects(TextTransformOther::FULL_SIZE_KANA) => { "full-size-kana" if !result.other_.intersects(TextTransformOther::FULL_SIZE_KANA) => {
result.other_.insert(TextTransformOther::FULL_SIZE_KANA) result.other_.insert(TextTransformOther::FULL_SIZE_KANA)
} },
_ => return Err(location.new_custom_error( _ => return Err(location.new_custom_error(
SelectorParseErrorKind::UnexpectedIdent(ident.clone()) SelectorParseErrorKind::UnexpectedIdent(ident.clone())
)), )),

2
components/style_traits/Cargo.toml
View file

@ -15,7 +15,7 @@ gecko = []
[dependencies] [dependencies]
app_units = "0.7" app_units = "0.7"
cssparser = "0.25" cssparser = "0.27.1"
bitflags = "1.0" bitflags = "1.0"
euclid = "0.20" euclid = "0.20"
lazy_static = "1" lazy_static = "1"

4
components/to_shmem/Cargo.toml
View file

@ -14,9 +14,9 @@ servo = ["cssparser/serde", "string_cache"]
gecko = [] gecko = []
[dependencies] [dependencies]
cssparser = "0.25" cssparser = "0.27.1"
servo_arc = { path = "../servo_arc" } servo_arc = { path = "../servo_arc" }
smallbitvec = "2.1.1" smallbitvec = "2.1.1"
smallvec = "0.6.6" smallvec = "0.6.6"
string_cache = { version = "0.7", optional = true } string_cache = { version = "0.8", optional = true }
thin-slice = "0.1.0" thin-slice = "0.1.0"

2
components/url/Cargo.toml
View file

@ -17,4 +17,4 @@ to_shmem = { path = "../to_shmem" }
serde = {version = "1.0", features = ["derive"]} serde = {version = "1.0", features = ["derive"]}
servo_rand = {path = "../rand"} servo_rand = {path = "../rand"}
url = {version = "2.0", features = ["serde"]} url = {version = "2.0", features = ["serde"]}
uuid = {version = "0.7", features = ["v4", "serde"]} uuid = {version = "0.8", features = ["v4", "serde"]}

2
components/webdriver_server/Cargo.toml
View file

@ -29,5 +29,5 @@ servo_config = {path = "../config"}
servo_url = {path = "../url"} servo_url = {path = "../url"}
style_traits = {path = "../style_traits"} style_traits = {path = "../style_traits"}
url = "2.0" url = "2.0"
uuid = {version = "0.7", features = ["v4"]} uuid = {version = "0.8", features = ["v4"]}
webdriver = "0.40" webdriver = "0.40"

3
servo-tidy.toml
View file

@ -15,13 +15,11 @@ lint-scripts = [
[blocked-packages] [blocked-packages]
num = [] num = []
rand = [ rand = [
"gaol",
"hashglobe", # Only used in tests "hashglobe", # Only used in tests
"ipc-channel", "ipc-channel",
"phf_generator", "phf_generator",
"servo_rand", "servo_rand",
"tempfile", "tempfile",
"tokio-threadpool",
"uuid", "uuid",
"ws", "ws",
] ]
@ -34,7 +32,6 @@ packages = [
"gleam", "gleam",
"proc-macro2", "proc-macro2",
"quote", "quote",
"rand_core",
"syn", "syn",
"synstructure", "synstructure",
"unicode-xid", "unicode-xid",

8
tests/unit/script/size_of.rs
View file

@ -31,9 +31,9 @@ macro_rules! sizeof_checker (
// Update the sizes here // Update the sizes here
sizeof_checker!(size_event_target, EventTarget, 56); sizeof_checker!(size_event_target, EventTarget, 56);
sizeof_checker!(size_node, Node, 176); sizeof_checker!(size_node, Node, 176);
sizeof_checker!(size_element, Element, 384); sizeof_checker!(size_element, Element, 352);
sizeof_checker!(size_htmlelement, HTMLElement, 400); sizeof_checker!(size_htmlelement, HTMLElement, 368);
sizeof_checker!(size_div, HTMLDivElement, 400); sizeof_checker!(size_div, HTMLDivElement, 368);
sizeof_checker!(size_span, HTMLSpanElement, 400); sizeof_checker!(size_span, HTMLSpanElement, 368);
sizeof_checker!(size_text, Text, 208); sizeof_checker!(size_text, Text, 208);
sizeof_checker!(size_characterdata, CharacterData, 208); sizeof_checker!(size_characterdata, CharacterData, 208);

4
tests/unit/style/Cargo.toml
View file

@ -11,9 +11,9 @@ doctest = false
[dependencies] [dependencies]
app_units = "0.7" app_units = "0.7"
cssparser = "0.25" cssparser = "0.27.1"
euclid = "0.20" euclid = "0.20"
html5ever = "0.24" html5ever = "0.25"
rayon = "1" rayon = "1"
serde_json = "1.0" serde_json = "1.0"
selectors = {path = "../../../components/selectors"} selectors = {path = "../../../components/selectors"}