Commit f6a6e37e authored by Jan-Erik Rediger's avatar Jan-Erik Rediger
Browse files

Bug 1788040 - Update to Glean v51.2.0. r=chutten,supply-chain-reviewers 

Differential Revision: https://phabricator.services.mozilla.com/D156937
parent a0bba4b6

Cargo.lock

+51 −27
Original line number Diff line number Diff line
@@ -2215,9 +2215,9 @@ dependencies = [ 


[[package]]

name = "glean"

version = "51.1.0"

version = "51.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d187c24d9b68cf4604253a38a15c5490f8089fa0abbd5d3a75a7dab6496c452c"

checksum = "692dfb4494ad83161b7d596656c3e1f08b06bc2fa62a0eb8a3f4b7f83594025e"

dependencies = [

 "chrono",

 "crossbeam-channel",
@@ -2235,9 +2235,9 @@ dependencies = [ 


[[package]]

name = "glean-core"

version = "51.1.0"

version = "51.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ff1c7b9f39201bd6983e178a6356597dce2ba2dd2ee1e9da41e36680cd4a99bf"

checksum = "0e26d3c442090135439a6c6618f60653b139ee5a89116605eab947d18b5d64e7"

dependencies = [

 "android_logger",

 "bincode",
@@ -2315,9 +2315,16 @@ dependencies = [ 


[[package]]

name = "goblin"

version = "0.1.3"

version = "0.1.99"

dependencies = [

 "goblin 0.5.4",

]



[[package]]

name = "goblin"

version = "0.5.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3081214398d39e4bd7f2c1975f0488ed04614ffdd976c6fc7a0708278552c0da"

checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143"

dependencies = [

 "log",

 "plain",
@@ -3273,7 +3280,7 @@ version = "0.1.0" 
source = "git+https://github.com/rust-minidump/minidump-writer.git?rev=75ada456c92a429704691a85e1cb42fef8cafc0d#75ada456c92a429704691a85e1cb42fef8cafc0d"

dependencies = [

 "byteorder",

 "goblin",

 "goblin 0.1.99",

 "libc",

 "memmap2 0.2.999",

 "memoffset 0.5.6",
@@ -4598,18 +4605,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" 


[[package]]

name = "scroll"

version = "0.10.2"

version = "0.11.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"

checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"

dependencies = [

 "scroll_derive",

]



[[package]]

name = "scroll_derive"

version = "0.10.5"

version = "0.11.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"

checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"

dependencies = [

 "proc-macro2",

 "quote",
@@ -5606,19 +5613,20 @@ checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" 


[[package]]

name = "uniffi"

version = "0.19.3"

version = "0.19.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bc1de33ad46ce00bc9a31cea44e80ef69175d3a23007335216fe3996880a310d"

checksum = "ea179ddeb64c249977c165b1d9f94af9c0a12a4f623e5986f553276612ea8796"

dependencies = [

 "anyhow",

 "bytes 1.2.1",

 "camino",

 "cargo_metadata",

 "lazy_static",

 "log",

 "once_cell",

 "paste",

 "static_assertions",

 "uniffi_bindgen",

 "uniffi_macros",

]



[[package]]
@@ -5704,29 +5712,32 @@ dependencies = [ 


[[package]]

name = "uniffi_bindgen"

version = "0.19.3"

version = "0.19.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b18e05c55840ddd690ba211f72bb1f2f6ca8c50bfeb7d7211ea5ee60b0f9be07"

checksum = "8849753c67126dd7e4f309d09b696378481bfe9b3f5cec0a0c2b8e27391789c8"

dependencies = [

 "anyhow",

 "askama",

 "bincode",

 "camino",

 "cargo_metadata",

 "clap",

 "fs-err",

 "goblin 0.5.4",

 "heck",

 "lazy_static",

 "once_cell",

 "paste",

 "serde",

 "serde_json",

 "toml",

 "uniffi_meta",

 "weedle2",

]



[[package]]

name = "uniffi_build"

version = "0.19.3"

version = "0.19.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8fff0860625e4e621f0317e5f6ac9e79966262bd86a6cfb2049e8425df23afbd"

checksum = "8d6c6fedf97b345227270837fcfd8d9a799f202af7fa843298c788fb943b159f"

dependencies = [

 "anyhow",

 "camino",
@@ -5735,16 +5746,30 @@ dependencies = [ 


[[package]]

name = "uniffi_macros"

version = "0.19.3"

version = "0.19.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7956a6c1fb12bff15e537028ea2174f000f90dd4f87912233b276ea782d420f2"

checksum = "090e5a993b51dc02faa0dc135ce94f02f050791bda283a5ae9f40fc9a4389a39"

dependencies = [

 "bincode",

 "camino",

 "glob",

 "fs-err",

 "once_cell",

 "proc-macro2",

 "quote",

 "serde",

 "syn",

 "toml",

 "uniffi_build",

 "uniffi_meta",

]



[[package]]

name = "uniffi_meta"

version = "0.19.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "10d099cea0c721294ec11ae6c39d661c96d13d8994247ffadaf1576b065e38e6"

dependencies = [

 "serde",

]



[[package]]
@@ -6103,12 +6128,11 @@ dependencies = [ 


[[package]]

name = "weedle2"

version = "3.0.0"

version = "4.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5d730d941cf471131c40a64cf2e8a595822009f51e64c05c5afdbc85af155857"

checksum = "2e79c5206e1f43a2306fd64bdb95025ee4228960f2e6c5a8b173f3caaf807741"

dependencies = [

 "fs-err",

 "nom 6.1.2",

 "nom 7.1.1",

]



[[package]]

Cargo.toml

+8 −5
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ tinyvec = { path = "build/rust/tinyvec" } 
# Patch wasi 0.10 to 0.11

wasi = { path = "build/rust/wasi" }



# Patch goblin 0.1 to 0.5

goblin = { path = "build/rust/goblin" }



# Patch hashbrown 0.11 to 0.12

hashbrown = { path = "build/rust/hashbrown" }
@@ -165,8 +168,8 @@ path = "third_party/rust/mio-0.6.23" 
# duplicate crates.



[patch."https://github.com/mozilla/uniffi-rs.git"]

uniffi = "=0.19.3"

uniffi_bindgen = "=0.19.3"

uniffi_build = "=0.19.3"

uniffi_macros = "=0.19.3"

weedle2 = "=3.0.0"
 
uniffi = "=0.19.6"

uniffi_bindgen = "=0.19.6"

uniffi_build = "=0.19.6"

uniffi_macros = "=0.19.6"

weedle2 = "=4.0.0"

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ allprojects { 
        topsrcdir = gradle.mozconfig.topsrcdir

        topobjdir = gradle.mozconfig.topobjdir



        gleanVersion = "51.1.0"

        gleanVersion = "51.2.0"

        if (gleanVersion != getRustVersionFor("glean")) {

          throw new StopExecutionException("Mismatched Glean version, expected: ${gleanVersion}," +

              " found ${getRustVersionFor("glean")}")

build/rust/goblin/Cargo.toml

0 → 100644
+11 −0
Original line number Diff line number Diff line 
[package]

name = "goblin"

version = "0.1.99"

edition = "2018"

license = "MPL-2.0"



[lib]

path = "lib.rs"



[dependencies.goblin]

version = "0.5.3"

build/rust/goblin/lib.rs

0 → 100644
+5 −0
Original line number Diff line number Diff line 
/* This Source Code Form is subject to the terms of the Mozilla Public

 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



pub use goblin::*;