Bug 1811218 - Revert patch override for Glean and rkv. r=glandium,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D167245

Cargo.lock

@@ -2302,6 +2302,8 @@ dependencies = [
 [[package]]
 name = "glean"
 version = "52.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5f600281679e10615de8d2a250cee5ea24ba55d3b714c15833fc1951806ebb2"
 dependencies = [
  "chrono",
  "crossbeam-channel",
@@ -2320,6 +2322,8 @@ dependencies = [
 [[package]]
 name = "glean-core"
 version = "52.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4357fa01f5b90c6e0fe0e39d434bf3b7394ed56f940bea4f221a2b355894fcfc"
 dependencies = [
  "android_logger",
  "bincode",
@@ -4562,6 +4566,8 @@ dependencies = [
 [[package]]
 name = "rkv"
 version = "0.18.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f0ea3af1393b22f8fe25615b6fa5d13072b7b622e66acffc8b12b2baa0342b1"
 dependencies = [
  "arrayref",
  "bincode",

Cargo.toml

@@ -192,13 +192,3 @@ weedle2 = "=4.0.0"
 # https://github.com/mozilla/uniffi-rs/pull/1405
 [patch.crates-io.uniffi_bindgen]
 path = "third_party/rust/uniffi_bindgen"
-
-# Patched to use uuid 1.0 until the upgrade to glean 52 (bug 1805427)
-# (patch from https://github.com/mozilla/glean/pull/2296)
-[patch.crates-io.glean]
-path = "third_party/rust/glean"
-[patch.crates-io.glean-core]
-path = "third_party/rust/glean-core"
-# Likewise, with patch from https://github.com/mozilla/rkv/pull/232
-[patch.crates-io.rkv]
-path = "third_party/rust/rkv"

supply-chain/config.toml

@@ -54,14 +54,6 @@ dependency-criteria = { tokio-reactor = [], tokio-threadpool = [] }
 [policy.gkrust_shared]
 notes = "The dependencies on tokio-reactor and tokio-threadpools are just a hack to pin the version used by audioipc-{client,server}. Suppress vetting on those for the same reasons behind the policy entries."
 
-[policy.glean]
-audit-as-crates-io = true
-notes = "Temporarily patched in-tree"
-
-[policy.glean-core]
-audit-as-crates-io = true
-notes = "Temporarily patched in-tree"
-
 [policy.gluesmith]
 criteria = "safe-to-run"
 notes = "Used for fuzzing."
@@ -138,10 +130,6 @@ notes = "This is a first-party crate which is entirely unrelated to the crates.i
 audit-as-crates-io = true
 notes = "This is a first-party crate which is also published to crates.io, but we should publish audits for it for the benefit of the ecosystem."
 
-[policy.rkv]
-audit-as-crates-io = true
-notes = "Temporarily patched in-tree"
-
 [policy.rure]
 audit-as-crates-io = true
 notes = "Identical to upstream, but with cdylib and staticlib targets disabled to avoid unnecessary build artifacts and linker errors."

third_party/rust/rkv/src/lib.rs

@@ -7,7 +7,6 @@
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
-#![allow(warnings)]
 #![allow(clippy::from_over_into)] // TODO: `Into` implementations in [safe/lmdb]/flags.rs
 
 //! A simple, humane, typed key-value storage solution. It supports multiple backend