0001-more-dep-updates.patch

From df919d2ca230ed5f5fd0f2eb4586fe72354f3bf7 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Wed, 13 Jul 2022 15:31:37 +0200
Subject: [PATCH] more dep updates

---
 gfx/wr/Cargo.lock        | 76 +++++-----------------------------------
 gfx/wr/servo-tidy.toml   |  4 ---
 gfx/wr/wrench/Cargo.toml |  2 +-
 3 files changed, 10 insertions(+), 72 deletions(-)

diff --git gfx/wr/Cargo.lock gfx/wr/Cargo.lock
index 0d2ea15a78a4b..c3bd5891708a0 100644
--- gfx/wr/Cargo.lock
+++ gfx/wr/Cargo.lock
@@ -242,7 +242,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.12",
+ "semver",
  "serde",
  "serde_json",
 ]
@@ -1546,9 +1546,9 @@ checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
 [[package]]
 name = "ordered-float"
-version = "1.0.2"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
+checksum = "96bcbab4bfea7a59c2c0fe47211a1ac4e3e96bea6eb446d704f310bc5c732ae2"
 dependencies = [
  "num-traits",
 ]
@@ -1609,31 +1609,12 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "paste"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
 
-[[package]]
-name = "paste-impl"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
-dependencies = [
- "proc-macro-hack",
-]
-
 [[package]]
 name = "peek-poke"
 version = "0.3.0"
@@ -1659,15 +1640,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
 [[package]]
 name = "pkg-config"
 version = "0.3.17"
@@ -1732,12 +1704,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.36"
@@ -1862,9 +1828,9 @@ checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
 
 [[package]]
 name = "rkv"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28e2e15d3fff125cfc4fb3f1b226ff83af057c4715061ded16193b7142beefc9"
+checksum = "a6006704273063c72952370ad236b8d58556dcc4f99a95ced4d9ad40f3e80a69"
 dependencies = [
  "arrayref",
  "bincode",
@@ -1875,7 +1841,7 @@ dependencies = [
  "lmdb-rkv",
  "log",
  "ordered-float",
- "paste 0.1.18",
+ "paste",
  "serde",
  "serde_derive",
  "thiserror",
@@ -1921,15 +1887,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.12"
@@ -1939,15 +1896,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.137"
@@ -2198,12 +2146,6 @@ dependencies = [
  "minidl",
 ]
 
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
 [[package]]
 name = "unicase"
 version = "2.6.0"
@@ -2246,7 +2188,7 @@ dependencies = [
  "cargo_metadata",
  "lazy_static",
  "log",
- "paste 1.0.7",
+ "paste",
  "static_assertions",
 ]
 
@@ -2264,7 +2206,7 @@ dependencies = [
  "fs-err",
  "heck",
  "lazy_static",
- "paste 1.0.7",
+ "paste",
  "serde",
  "toml",
  "weedle2",
@@ -2704,7 +2646,7 @@ dependencies = [
  "ndk-glue",
  "osmesa-src",
  "osmesa-sys",
- "semver 0.11.0",
+ "semver",
  "serde",
  "serde_json",
  "swgl",
diff --git gfx/wr/servo-tidy.toml gfx/wr/servo-tidy.toml
index acf70d242457d..5956ea580e645 100644
--- gfx/wr/servo-tidy.toml
+++ gfx/wr/servo-tidy.toml
@@ -14,10 +14,6 @@ packages = [
     # glsl requires 5.1, and xcursor (required by winit) requires 7.1.
     # when a version of glsl depending on 7.1 is published we can update.
     "nom",
-    # Transitive dependency of Glean - see bug 1771743
-    # * v0.1.18 through rkv
-    # * v1.0.7 through UniFFI
-    "paste",
     "rand_core",
     # Can be fixed by removing time dependency - see bug 1765324
     "wasi",
diff --git gfx/wr/wrench/Cargo.toml gfx/wr/wrench/Cargo.toml
index 2ebac1e9dc241..be3d55906937b 100644
--- gfx/wr/wrench/Cargo.toml
+++ gfx/wr/wrench/Cargo.toml
@@ -29,7 +29,7 @@ osmesa-src = { version = "0.2", git = "https://github.com/servo/osmesa-src", opt
 webrender = { path = "../webrender", features = ["capture", "replay", "png", "profiler", "no_static_freetype", "leak_checks"] }
 winit = "0.26"
 serde = { version = "1.0", features = ["derive"] }
-semver = "0.11.0"
+semver = "1.0.0"
 swgl = { path = "../swgl", optional = true }
 tracy-rs = "0.1.2"
 
-- 
2.35.3