Skip to content

Commit a79e5ae

Browse files
gustavoavenameta-codesync[bot]
authored andcommitted
Update servers/slapi, tests, and tools crates (final batch) to use new mononoke justknob crate
Summary: Mechanical step 10/10 of the BUCK dep swap from `//common/rust/shed/justknobs_stub:justknobs` to `//eden/mononoke/common/rust/justknobs_ext:justknobs`. See D106467432 for the motivation and the new crate. After this diff, no crate under `fbcode/eden/mononoke/` depends on `//common/rust/shed/justknobs_stub:justknobs` directly. Every Mononoke caller now goes through `//eden/mononoke/common/rust/justknobs_ext:justknobs`, which enforces the Mononoke style rule that a missing or misspelled JustKnob panics at the call site instead of being silently masked by `unwrap_or(default)`. **I confirmed that no other crates under `eden/mononoke` (besides the new `justknobs_ext`) depend directly on the `justknobs_stub` crate : ``` ╰─>$ buck2 cquery 'kind("rust*", rdeps(fbcode//eden/mononoke/..., fbcode//common/rust/shed/justknobs_stub:, 1))' > /tmp/justknobs_stub_deps_mononoke.out Skipped 101 incompatible targets: fbcode//eden/mononoke/clients/facebook/git_pushrebase:_git_universal_pushrebase_macos_arm64 (cfg:dev-linux-x86_64-fbcode-platform010-clang19-asan-ubsan-dev#5f46caaa1d33a3cc) fbcode//eden/mononoke/clients/facebook/git_pushrebase:_git_universal_pushrebase_macos_x86_64 (cfg:dev-linux-x86_64-fbcode-platform010-clang19-asan-ubsan-dev#5f46caaa1d33a3cc) fbcode//eden/mononoke/clients/facebook/git_pushrebase:git_universal_pushrebase (cfg:dev-linux-x86_64-fbcode-platform010-clang19-asan-ubsan-dev#5f46caaa1d33a3cc) ... fbcode//eden/mononoke/scs/if:source_control-py3-default-types__source_control/types.cpp (cfg:dev-linux-x86_64-fbcode-platform010-clang19-asan-ubsan-dev#d7f75479a3c4990a) fbcode//eden/mononoke/scs/if:source_control-py3-default-types__source_control/types_empty.cpp (cfg:dev-linux-x86_64-fbcode-platform010-clang19-asan-ubsan-dev#d7f75479a3c4990a) fbcode//eden/mononoke/scs/if:source_control-py3-default-types__source_control/types_fields.cpp (cfg:dev-linux-x86_64-fbcode-platform010-clang19-asan-ubsan-dev#d7f75479a3c4990a) Buck UI: https://www.internalfb.com/buck2/1dc29406-336b-4608-a280-b6927dd85b18 Network: Up: 0B Down: 0B Command: cquery. Time elapsed: 8.4s [2026-05-27T11:41:08.160+01:00] Network: Up: 0B Down: 0B ┬─[gustavoavena@devvm34754:/d/r/f/fbcode]─[10:41:08] (954d0c1b1b) ╰─>$ cat /tmp/justknobs_stub_deps_mononoke.out | cut -d' ' -f1 | sort | uniq fbcode//common/rust/shed/justknobs_stub:justknobs fbcode//datainfra/privacy/policy_zones_metadata/fetch_policy_zones_label:fetch_policy_zones_label fbcode//eden/mononoke/common/rust/justknobs_ext:justknobs fbcode//eden/mononoke/common/rust/justknobs_ext:justknobs-unittest ``` Reviewed By: YousefSalama Differential Revision: D106489346 fbshipit-source-id: d60926cfc9c12f0ed68fe8817ef1be862abc300a
1 parent 93ded00 commit a79e5ae

9 files changed

Lines changed: 9 additions & 9 deletions

File tree

eden/mononoke/tests/utils/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ rust_library(
2323
"fbsource//third-party/rust:rand",
2424
"fbsource//third-party/rust:rand_distr",
2525
"//common/rust/shed/facet:facet",
26-
"//common/rust/shed/justknobs_stub:justknobs",
2726
"//eden/mononoke/blobstore:blobstore",
27+
"//eden/mononoke/common/rust/justknobs_ext:justknobs",
2828
"//eden/mononoke/derived_data:fsnodes",
2929
"//eden/mononoke/derived_data/content_manifest_derivation:content_manifest_derivation",
3030
"//eden/mononoke/features/changesets_creation:changesets_creation",

eden/mononoke/tests/utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ facet = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust
2424
filestore = { version = "0.1.0", path = "../../repo_attributes/filestore" }
2525
fsnodes = { version = "0.1.0", path = "../../derived_data/fsnodes" }
2626
futures = { version = "0.3.31", features = ["async-await", "compat"] }
27-
justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
27+
justknobs = { version = "0.1.0", path = "../../common/rust/justknobs_ext" }
2828
manifest = { version = "0.1.0", path = "../../manifest" }
2929
maplit = "1.0"
3030
mercurial_types = { version = "0.1.0", path = "../../mercurial/types" }

eden/mononoke/tests/utils/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ pub async fn list_working_copy_with_types(
159159
"scm/mononoke:derived_data_use_content_manifests",
160160
None,
161161
Some(repo.repo_identity().name()),
162-
)? {
162+
) {
163163
let root = repo
164164
.repo_derived_data()
165165
.derive::<RootContentManifestId>(ctx, cs_id, DerivationPriority::LOW)

eden/mononoke/tools/admin/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ rust_binary(
6161
"//common/rust/shed/facet:facet",
6262
"//common/rust/shed/fbinit:fbinit",
6363
"//common/rust/shed/futures_stats:futures_stats",
64-
"//common/rust/shed/justknobs_stub:justknobs",
6564
"//common/rust/shed/sorted_vector_map:sorted_vector_map",
6665
"//eden/mononoke/blobrepo:blobrepo_hg",
6766
"//eden/mononoke/blobrepo_utils:blobrepo_utils",
@@ -79,6 +78,7 @@ rust_binary(
7978
"//eden/mononoke/common/metadata:metadata",
8079
"//eden/mononoke/common/mononoke_macros:mononoke_macros",
8180
"//eden/mononoke/common/permission_checker:permission_checker",
81+
"//eden/mononoke/common/rust/justknobs_ext:justknobs",
8282
"//eden/mononoke/common/rust/sql_ext:sql_ext",
8383
"//eden/mononoke/common/scuba_ext:scuba_ext",
8484
"//eden/mononoke/common/time_measuring:time_measuring",

eden/mononoke/tools/admin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ gix-hash = { version = "0.25.0", features = ["sha1"] }
7777
gix-object = "0.60.0"
7878
history_manifest = { version = "0.1.0", path = "../../derived_data/history_manifest" }
7979
itertools = "0.14.0"
80-
justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
80+
justknobs = { version = "0.1.0", path = "../../common/rust/justknobs_ext" }
8181
live_commit_sync_config = { version = "0.1.0", path = "../../features/commit_rewriting/live_commit_sync_config" }
8282
manifest = { version = "0.1.0", path = "../../manifest" }
8383
maplit = "1.0"

eden/mononoke/tools/admin/src/commands/fetch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ async fn display_fsnode(
207207
"scm/mononoke:derived_data_use_content_manifests",
208208
None,
209209
Some(repo.repo_identity().name()),
210-
)?;
210+
);
211211

212212
let root_manifest_id: compat::ContentManifestId = if use_content_manifests {
213213
repo.repo_derived_data()

eden/mononoke/tools/admin/src/commands/megarepo/delete_no_longer_bound_files_from_large_repo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub async fn run(
8989
"scm/mononoke:derived_data_use_content_manifests",
9090
None,
9191
Some(large_repo.repo_identity().name()),
92-
)?;
92+
);
9393

9494
let root: compat::ContentManifestId = if use_content_manifests {
9595
large_repo

eden/mononoke/tools/admin/src/commands/redaction/create_key_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ async fn content_keys_for_paths(
184184
"scm/mononoke:derived_data_use_content_manifests",
185185
None,
186186
Some(repo.repo_identity.name()),
187-
)?;
187+
);
188188

189189
let root_manifest_id: compat::ContentManifestId = if use_content_manifests {
190190
repo.repo_derived_data()

eden/mononoke/tools/admin/src/commands/redaction/list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub(super) async fn paths_for_content_keys(
5656
"scm/mononoke:derived_data_use_content_manifests",
5757
None,
5858
Some(repo.repo_identity().name()),
59-
)?;
59+
);
6060

6161
let root: compat::ContentManifestId = if use_content_manifests {
6262
repo.repo_derived_data()

0 commit comments

Comments
 (0)