From c83e0b2e2d738529242ac5c43f004078c17cb04f Mon Sep 17 00:00:00 2001 From: Dimitris Iliopoulos Date: Wed, 29 Jan 2025 08:41:45 -0800 Subject: [PATCH] Back out "upgrade to 0.22.6" Summary: This diff is backing out: D68466072, D68679908, D68679909, D68687706, D68687707, D68693388, D68780982 and D68784256 ignore-conflict-markers overriding_review_checks_triggers_an_audit_and_retroactive_review Oncall Short Name: rust_foundation Differential Revision: D68813766 fbshipit-source-id: 465aafc89916c5d730e7c12ead4850d36501f455 --- eden/fs/Cargo.toml | 1 + eden/mononoke/Cargo.toml | 1 + eden/mononoke/filestore/Cargo.toml | 2 +- eden/mononoke/mercurial/types/Cargo.toml | 2 +- eden/scm/lib/edenapi/types/Cargo.toml | 2 +- eden/scm/lib/types/Cargo.toml | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eden/fs/Cargo.toml b/eden/fs/Cargo.toml index 9507c92fdd746..30fea1f4bf121 100644 --- a/eden/fs/Cargo.toml +++ b/eden/fs/Cargo.toml @@ -12,6 +12,7 @@ lru-disk-cache = { git = "https://github.com/mozilla/sccache", rev = "fdbf843d17 perf-event = { version = "0.4", git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167" } perf-event-open-sys = { version = "4.0", git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167" } profiling = { version = "1.0.16", git = "https://github.com/aclysma/profiling.git", rev = "1b3e20c8e59eddbb6ae0d64fff849d07a903dd0c" } +pyo3-build-config = { package = "pyo3-build-config", version = "0.21.2", git = "https://github.com/fbsource/pyo3", rev = "ff94a09031cc29d88d57ae3c846e5b871497aeb9" } quickcheck = { git = "https://github.com/jakoschiko/quickcheck", rev = "6ecdf5bb4b0132ce66670b4d46453aa022ea892c" } tree-sitter-bash = { git = "https://github.com/cfsmp3/tree-sitter-bash", rev = "4e9968457cd1ee5a51f8ab875cc2fcaaf7294e94" } tree-sitter-c = { git = "https://github.com/cfsmp3/tree-sitter-c", rev = "d01f584b67e581e9888b4b8e71e7150fd3867e38" } diff --git a/eden/mononoke/Cargo.toml b/eden/mononoke/Cargo.toml index 2356c12a45c31..9d51560f51acb 100644 --- a/eden/mononoke/Cargo.toml +++ b/eden/mononoke/Cargo.toml @@ -96,6 +96,7 @@ lru-disk-cache = { git = "https://github.com/mozilla/sccache", rev = "fdbf843d17 perf-event = { version = "0.4", git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167" } perf-event-open-sys = { version = "4.0", git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167" } profiling = { version = "1.0.16", git = "https://github.com/aclysma/profiling.git", rev = "1b3e20c8e59eddbb6ae0d64fff849d07a903dd0c" } +pyo3-build-config = { package = "pyo3-build-config", version = "0.21.2", git = "https://github.com/fbsource/pyo3", rev = "ff94a09031cc29d88d57ae3c846e5b871497aeb9" } quickcheck = { git = "https://github.com/jakoschiko/quickcheck", rev = "6ecdf5bb4b0132ce66670b4d46453aa022ea892c" } tree-sitter-bash = { git = "https://github.com/cfsmp3/tree-sitter-bash", rev = "4e9968457cd1ee5a51f8ab875cc2fcaaf7294e94" } tree-sitter-c = { git = "https://github.com/cfsmp3/tree-sitter-c", rev = "d01f584b67e581e9888b4b8e71e7150fd3867e38" } diff --git a/eden/mononoke/filestore/Cargo.toml b/eden/mononoke/filestore/Cargo.toml index 09a725e5b545a..4d99b1577ce78 100644 --- a/eden/mononoke/filestore/Cargo.toml +++ b/eden/mononoke/filestore/Cargo.toml @@ -10,7 +10,7 @@ license = "GPLv2+" [dependencies] anyhow = "1.0.95" async-trait = "0.1.71" -blake3 = { version = "=1.5.1", features = ["mmap", "rayon", "traits-preview"] } +blake3 = { version = "=1.5.0", features = ["rayon", "traits-preview"] } blobstore = { version = "0.1.0", path = "../blobstore" } bytes = { version = "1.9.0", features = ["serde"] } cloned = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" } diff --git a/eden/mononoke/mercurial/types/Cargo.toml b/eden/mononoke/mercurial/types/Cargo.toml index 631fa3e5a8934..bb2dd2b0fa5d4 100644 --- a/eden/mononoke/mercurial/types/Cargo.toml +++ b/eden/mononoke/mercurial/types/Cargo.toml @@ -16,7 +16,7 @@ async-stream = "0.3" async-trait = "0.1.71" base64 = "0.21" bitflags = { version = "2.6", features = ["serde"] } -blake3 = { version = "=1.5.1", features = ["mmap", "rayon", "traits-preview"] } +blake3 = { version = "=1.5.0", features = ["rayon", "traits-preview"] } blobstore = { version = "0.1.0", path = "../../blobstore" } bytes = { version = "1.9.0", features = ["serde"] } cloned = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" } diff --git a/eden/scm/lib/edenapi/types/Cargo.toml b/eden/scm/lib/edenapi/types/Cargo.toml index 5107e85d5c740..2d073f03f8cab 100644 --- a/eden/scm/lib/edenapi/types/Cargo.toml +++ b/eden/scm/lib/edenapi/types/Cargo.toml @@ -18,7 +18,7 @@ path = "test/basic_test.rs" [dependencies] anyhow = "1.0.95" -blake3 = { version = "=1.5.1", features = ["mmap", "rayon", "traits-preview"] } +blake3 = { version = "=1.5.0", features = ["rayon", "traits-preview"] } bytes = { version = "1.9.0", features = ["serde"] } paste = "1.0.14" quickcheck = "1.0" diff --git a/eden/scm/lib/types/Cargo.toml b/eden/scm/lib/types/Cargo.toml index eb39b339a3901..3d739583208f3 100644 --- a/eden/scm/lib/types/Cargo.toml +++ b/eden/scm/lib/types/Cargo.toml @@ -16,7 +16,7 @@ name = "types" anyhow = "1.0.95" base64 = "0.21" bitflags = { version = "2.6", features = ["serde"] } -blake3 = { version = "=1.5.1", features = ["mmap", "rayon", "traits-preview"] } +blake3 = { version = "=1.5.0", features = ["rayon", "traits-preview"] } byteorder = "1.3" lazy_static = { version = "1.4", optional = true } quickcheck = { version = "1.0", optional = true }