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

Merge branch 'servo:master' into issue#29773

Browse source
This commit is contained in:
Michael Grigoryan 2023-05-23 09:51:22 +04:00 • committed by GitHub
commit e3fed81a2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Cargo.lock generated
View file

@ -1146,7 +1146,7 @@ dependencies = [
"dtoa-short",
"itoa 1.0.1",
"matches",
"phf 0.10.1",
"phf",
"proc-macro2",
"quote",
"serde",
@ -3521,8 +3521,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
dependencies = [
"log",
"phf 0.10.1",
"phf_codegen 0.10.0",
"phf",
"phf_codegen",
"string_cache",
"string_cache_codegen",
"tendril",
@ -4480,15 +4480,6 @@ dependencies = [
"indexmap",
]
[[package]]
name = "phf"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
"phf_shared 0.8.0",
]
[[package]]
name = "phf"
version = "0.10.1"
@ -4496,38 +4487,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
dependencies = [
"phf_macros",
"phf_shared 0.10.0",
"phf_shared",
"proc-macro-hack",
]
[[package]]
name = "phf_codegen"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
dependencies = [
"phf_generator 0.8.0",
"phf_shared 0.8.0",
]
[[package]]
name = "phf_codegen"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
dependencies = [
"phf_generator 0.10.0",
"phf_shared 0.10.0",
]
[[package]]
name = "phf_generator"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [
"phf_shared 0.8.0",
"rand 0.7.3",
"phf_generator",
"phf_shared",
]
[[package]]
@ -4536,7 +4507,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
dependencies = [
"phf_shared 0.10.0",
"phf_shared",
"rand 0.8.5",
]
@ -4546,23 +4517,14 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
dependencies = [
"phf_generator 0.10.0",
"phf_shared 0.10.0",
"phf_generator",
"phf_shared",
"proc-macro-hack",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "phf_shared"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
dependencies = [
"siphasher",
]
[[package]]
name = "phf_shared"
version = "0.10.0"
@ -4784,7 +4746,6 @@ dependencies = [
"rand_chacha 0.2.2",
"rand_core 0.5.1",
"rand_hc",
"rand_pcg",
]
[[package]]
@ -4854,15 +4815,6 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "rand_pcg"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "range"
version = "0.0.1"
@ -5152,9 +5104,9 @@ dependencies = [
"num-traits",
"parking_lot 0.11.2",
"percent-encoding",
"phf 0.8.0",
"phf_codegen 0.8.0",
"phf_shared 0.8.0",
"phf",
"phf_codegen",
"phf_shared",
"pixels",
"profile_traits",
"range",
@ -5310,8 +5262,8 @@ dependencies = [
"derive_more",
"fxhash",
"log",
"phf 0.8.0",
"phf_codegen 0.8.0",
"phf",
"phf_codegen",
"precomputed-hash",
"servo_arc",
"smallvec",
@ -6013,7 +5965,7 @@ dependencies = [
"new_debug_unreachable",
"once_cell",
"parking_lot 0.12.0",
"phf_shared 0.10.0",
"phf_shared",
"precomputed-hash",
"serde",
]
@ -6024,8 +5976,8 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
"phf_generator 0.10.0",
"phf_shared 0.10.0",
"phf_generator",
"phf_shared",
"proc-macro2",
"quote",
]

6
components/script/Cargo.toml
View file

@ -25,8 +25,8 @@ uwp = ["js/uwp"]
xr-profile = ["webxr-api/profile"]
[build-dependencies]
phf_codegen = "0.8"
phf_shared = "0.8"
phf_codegen = "0.10"
phf_shared = "0.10"
serde_json = { workspace = true }
[dependencies]
@ -82,7 +82,7 @@ net_traits = { path = "../net_traits" }
num-traits = { workspace = true }
parking_lot = { workspace = true }
percent-encoding = { workspace = true }
phf = "0.8"
phf = "0.10"
pixels = { path = "../pixels" }
profile_traits = { path = "../profile_traits" }
range = { path = "../range" }

4
components/selectors/Cargo.toml
View file

@ -25,7 +25,7 @@ cssparser = "0.29"
derive_more = "0.99"
fxhash = "0.2"
log = "0.4"
phf = "0.8"
phf = "0.10"
precomputed-hash = "0.1"
servo_arc = { version = "0.2", path = "../servo_arc" }
smallvec = "1.0"
@ -33,4 +33,4 @@ to_shmem = { version = "0.0.0", path = "../to_shmem", optional = true }
to_shmem_derive = { version = "0.0.0", path = "../to_shmem_derive", optional = true }
[build-dependencies]
phf_codegen = "0.8"
phf_codegen = "0.10"

4
servo-tidy.toml
View file

@ -41,10 +41,6 @@ packages = [
"parking_lot",
"parking_lot_core",
"petgraph",
"phf",
"phf_codegen",
"phf_generator",
"phf_shared",
"png",
"rand",
"rand_chacha",