Skip to content

Commit ad06b31

Browse files
jdelliotfacebook-github-bot
authored andcommitted
Refactor code from config/loader into config/fb/remote-loader
Summary: # This Diff Refactor code from config/loader into config/fb/remote-loader # Next Steps Continue to refactor the bits that are purely associated with fetching configurations from configerator. This will involve removing dependencies on Generater, ConfigSet and other Sapling specific types. # Context We would like to be able to know which partner is using our client library and collect metrics. We also want to be able to associate various configuration elements to a use case. To this end we are introducing a use-case-id, use-case configuration, and telemetry collection for a use-case. Reviewed By: quark-zju Differential Revision: D74728390 fbshipit-source-id: edaf0c6900de26979c9eb914598fc04e3326e361
1 parent 2bc229e commit ad06b31

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

eden/scm/lib/config/loader/BUCK

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ rust_library(
2222
"features": {
2323
"default": [],
2424
"fb": [
25-
"sha2",
2625
"sapling-types",
27-
"zstd",
2826
"sapling-identity/fb",
2927
"filetime",
3028
"sapling-hgtime",
@@ -33,7 +31,6 @@ rust_library(
3331
"serde_json",
3432
"serde",
3533
"serde_urlencoded",
36-
"sha2",
3734
],
3835
"sl_oss": [],
3936
},
@@ -73,7 +70,6 @@ rust_library(
7370
"//eden/scm/lib/util/hgplain:hgplain",
7471
] + ([] if rust_oss.is_oss_build() else [
7572
"//devx_www/cross_env_session_id:cross_env_session_id",
76-
"fbsource//third-party/rust:base64",
7773
"fbsource//third-party/rust:dirs",
7874
"fbsource//third-party/rust:faccess",
7975
"fbsource//third-party/rust:filetime",
@@ -82,15 +78,12 @@ rust_library(
8278
"fbsource//third-party/rust:serde",
8379
"fbsource//third-party/rust:serde_json",
8480
"fbsource//third-party/rust:serde_urlencoded",
85-
"fbsource//third-party/rust:sha2",
8681
"fbsource//third-party/rust:url",
87-
"fbsource//third-party/rust:zstd",
8882
"//common/rust/fbwhoami:fbwhoami",
8983
"//common/rust/shed/hostcaps:hostcaps",
9084
"//eden/scm/lib/config/fb/remote-loader:remote-loader",
9185
"//eden/scm/lib/hgtime:hgtime",
9286
"//eden/scm/lib/http-client:http-client",
93-
"//eden/scm/lib/io:io",
9487
"//eden/scm/lib/spawn-ext:spawn-ext",
9588
"//eden/scm/lib/types:types",
9689
"//eden/scm/lib/util:util",

eden/scm/lib/config/loader/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ harness = false
1919

2020
[dependencies]
2121
anyhow = "1.0.95"
22-
base64 = { version = "0.21", features = ["alloc"] }
2322
dirs = "6.0"
2423
faccess = "0.2.4"
2524
filetime = { version = "0.2.9", optional = true }
@@ -33,7 +32,6 @@ sapling-hgplain = { version = "0.1.0", path = "../../util/hgplain" }
3332
sapling-hgtime = { version = "0.1.0", path = "../../hgtime", optional = true }
3433
sapling-http-client = { version = "0.1.0", path = "../../http-client", optional = true }
3534
sapling-identity = { version = "0.1.0", path = "../../identity" }
36-
sapling-io = { version = "0.1.0", path = "../../io" }
3735
sapling-minibytes = { version = "0.1.0", path = "../../minibytes" }
3836
sapling-repo-minimal-info = { version = "0.1.0", path = "../../repo/repo-minimal-info" }
3937
sapling-repourl = { version = "0.1.0", path = "../../repo/url" }
@@ -46,10 +44,8 @@ sapling-version = { version = "0.1.0", path = "../../version" }
4644
serde = { version = "1.0.185", features = ["derive", "rc"], optional = true }
4745
serde_json = { version = "1.0.140", features = ["float_roundtrip", "unbounded_depth"], optional = true }
4846
serde_urlencoded = { version = "0.7", optional = true }
49-
sha2 = { version = "0.10.6", optional = true }
5047
tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
5148
url = "2.5.2"
52-
zstd = { version = "0.13", features = ["experimental", "zstdmt"], optional = true }
5349

5450
[dev-dependencies]
5551
once_cell = "1.12"
@@ -59,5 +55,5 @@ tempfile = "3.15"
5955

6056
[features]
6157
default = []
62-
fb = ["filetime", "regex", "sapling-hgtime", "sapling-http-client", "sapling-identity/fb", "sapling-types", "serde", "serde_json", "serde_urlencoded", "sha2", "sha2", "zstd"]
58+
fb = ["filetime", "regex", "sapling-hgtime", "sapling-http-client", "sapling-identity/fb", "sapling-types", "serde", "serde_json", "serde_urlencoded"]
6359
sl_oss = []

0 commit comments

Comments
 (0)