Commit 1de53ad3 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1825480 - Update crossbeam-epoch to 0.9.14 and minidump-writer to current... 

Bug 1825480 - Update crossbeam-epoch to 0.9.14 and minidump-writer to current master. r=gsvelto,supply-chain-reviewers

This updates memoffset to 0.8 and nix to 0.26.

Differential Revision: https://phabricator.services.mozilla.com/D174055
parent 93784bac

.cargo/config.in

+2 −2
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ git = "https://github.com/mozilla/uniffi-rs.git" 
rev = "bc7ff8977bf38d0fdd1a458810b14f434d4dc4de"

replace-with = "vendored-sources"



[source."git+https://github.com/rust-minidump/minidump-writer.git?rev=7d76616d27b9dc87fe3a94639b8b4f947d52a6aa"]

[source."git+https://github.com/rust-minidump/minidump-writer.git?rev=59179c83ba62e4378619c6967c0b8c0c077cac2d"]

git = "https://github.com/rust-minidump/minidump-writer.git"

rev = "7d76616d27b9dc87fe3a94639b8b4f947d52a6aa"

rev = "59179c83ba62e4378619c6967c0b8c0c077cac2d"

replace-with = "vendored-sources"



[source."git+https://github.com/servo/rust-cssparser?rev=45bc47e2bcb846f1efb5aea156be5fe7d18624bf"]

Cargo.lock

+13 −13
Original line number Diff line number Diff line
@@ -960,14 +960,14 @@ dependencies = [ 


[[package]]

name = "crossbeam-epoch"

version = "0.9.13"

version = "0.9.14"

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

checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"

checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"

dependencies = [

 "autocfg",

 "cfg-if 1.0.0",

 "crossbeam-utils",

 "memoffset 0.7.1",

 "memoffset 0.8.0",

 "scopeguard",

]
@@ -3142,14 +3142,14 @@ dependencies = [ 
name = "memoffset"

version = "0.6.99"

dependencies = [

 "memoffset 0.7.1",

 "memoffset 0.8.0",

]



[[package]]

name = "memoffset"

version = "0.7.1"

version = "0.8.0"

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

checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"

checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"

dependencies = [

 "autocfg",

]
@@ -3228,7 +3228,7 @@ dependencies = [ 
[[package]]

name = "minidump-writer"

version = "0.7.0"

source = "git+https://github.com/rust-minidump/minidump-writer.git?rev=7d76616d27b9dc87fe3a94639b8b4f947d52a6aa#7d76616d27b9dc87fe3a94639b8b4f947d52a6aa"

source = "git+https://github.com/rust-minidump/minidump-writer.git?rev=59179c83ba62e4378619c6967c0b8c0c077cac2d#59179c83ba62e4378619c6967c0b8c0c077cac2d"

dependencies = [

 "byteorder",

 "cfg-if 1.0.0",
@@ -3237,9 +3237,9 @@ dependencies = [ 
 "libc",

 "mach2",

 "memmap2",

 "memoffset 0.7.1",

 "memoffset 0.8.0",

 "minidump-common",

 "nix 0.25.1",

 "nix 0.26.2",

 "scroll",

 "tempfile",

 "thiserror",
@@ -3618,19 +3618,19 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" 
name = "nix"

version = "0.24.99"

dependencies = [

 "nix 0.25.1",

 "nix 0.26.2",

]



[[package]]

name = "nix"

version = "0.25.1"

version = "0.26.2"

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

checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"

checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"

dependencies = [

 "autocfg",

 "bitflags",

 "cfg-if 1.0.0",

 "libc",

 "static_assertions",

]



[[package]]

Cargo.toml

+3 −3
Original line number Diff line number Diff line
@@ -121,10 +121,10 @@ wasi = { path = "build/rust/wasi" } 
# Patch bindgen 0.63 to 0.64

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



# Patch memoffset 0.6 to 0.7

# Patch memoffset 0.6 to 0.8

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



# Patch nix 0.24 to 0.25

# Patch nix 0.24 to 0.26

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



# Patch hermit-abi 0.1 to 0.2
@@ -157,7 +157,7 @@ firefox-on-glean = { path = "toolkit/components/glean/api" } 
libudev-sys = { path = "dom/webauthn/libudev-sys" }

packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="412f9a0aa556611de021bde89dee8fefe6e0fbbd" }

midir = { git = "https://github.com/mozilla/midir.git", rev = "519e651241e867af3391db08f9ae6400bc023e18" }

minidump-writer = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "7d76616d27b9dc87fe3a94639b8b4f947d52a6aa" }

minidump-writer = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "59179c83ba62e4378619c6967c0b8c0c077cac2d" }

# warp 0.3.3 + https://github.com/seanmonstar/warp/pull/1007

warp = { git = "https://github.com/glandium/warp", rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d" }

build/rust/memoffset/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ license = "MPL-2.0" 
path = "lib.rs"



[dependencies.memoffset]

version = "0.7"
 
version = "0.8"

build/rust/nix/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ license = "MPL-2.0" 
path = "lib.rs"



[dependencies.nix]

version = "0.25"

version = "0.26"

default-features = false



[features]