Skip to content

Commit 8cb6c9a

Browse files
authored
undo crate dep reorganization
1 parent 8f915c9 commit 8cb6c9a

File tree

5 files changed

+8
-56
lines changed

5 files changed

+8
-56
lines changed

Cargo.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ members = [
1111
"sdk/core/azure_core_test_macros",
1212
"sdk/core/azure_core_opentelemetry",
1313
"sdk/cosmos/azure_data_cosmos",
14-
"sdk/cosmos/azure_data_cosmos_native",
1514
"sdk/identity/azure_identity",
1615
"sdk/eventhubs/azure_messaging_eventhubs",
1716
"sdk/eventhubs/azure_messaging_eventhubs_checkpointstore_blob",
@@ -93,10 +92,8 @@ async-trait = "0.1"
9392
base64 = "0.22"
9493
bytes = "1.0"
9594
cargo_metadata = "0.18.1"
96-
cbindgen = "0.29.0"
9795
clap = { version = "4.5.45", features = ["derive"] }
9896
criterion = { version = "0.5", features = ["async_tokio"] }
99-
dotenvy = "0.15.7"
10097
dyn-clone = "1.0"
10198
fe2o3-amqp = { version = "0.14", features = ["uuid"] }
10299
fe2o3-amqp-ext = { version = "0.14" }
@@ -148,10 +145,6 @@ tracing = "0.1.40"
148145
tracing-subscriber = "0.3"
149146
url = "2.2"
150147
uuid = { version = "1.18", features = ["v4"] }
151-
ureq = { version = "3", default-features = false, features = [
152-
"gzip",
153-
"native-tls",
154-
] }
155148
wasm-bindgen-futures = "0.4"
156149
wasm-bindgen-test = "0.3"
157150
zerofrom = "0.1.5"

eng/dict/crates.txt

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,49 @@
11
async-lock
22
async-stream
33
async-trait
4-
async_lock
5-
async_stream
6-
async_trait
74
azure_core
85
azure_core
96
azure_core_amqp
107
azure_core_amqp
11-
azure_core_macros
12-
azure_core_macros
13-
azure_core_opentelemetry
14-
azure_core_opentelemetry
158
azure_core_test
169
azure_core_test
1710
azure_core_test_macros
1811
azure_core_test_macros
1912
azure_data_cosmos
20-
azure_data_cosmos_native
2113
azure_identity
2214
azure_identity
2315
azure_messaging_eventhubs
24-
azure_messaging_eventhubs
25-
azure_messaging_eventhubs_checkpointstore_blob
26-
azure_messaging_servicebus
27-
azure_security_keyvault_certificates
2816
azure_security_keyvault_keys
2917
azure_security_keyvault_secrets
3018
azure_storage_blob
31-
azure_storage_blob
32-
azure_storage_common
3319
azure_template
3420
azure_template_core
3521
base64
3622
bytes
3723
cargo_metadata
38-
cbindgen
3924
clap
40-
criterion
4125
dotenvy
4226
dyn-clone
43-
dyn_clone
4427
fe2o3-amqp
4528
fe2o3-amqp-cbs
4629
fe2o3-amqp-ext
4730
fe2o3-amqp-management
4831
fe2o3-amqp-types
49-
fe2o3_amqp
50-
fe2o3_amqp_cbs
51-
fe2o3_amqp_ext
52-
fe2o3_amqp_management
53-
fe2o3_amqp_types
5432
flate2
5533
futures
5634
getrandom
57-
gloo-timers
58-
gloo_timers
35+
gloo
5936
hmac
6037
litemap
6138
log
6239
openssl
63-
opentelemetry
64-
opentelemetry-http
65-
opentelemetry_http
66-
opentelemetry_sdk
6740
pin-project
68-
pin_project
6941
proc-macro2
70-
proc_macro2
7142
quick-xml
72-
quick_xml
7343
quote
7444
rand
7545
rand_chacha
7646
reqwest
77-
rust_decimal
7847
rustc_version
7948
serde
8049
serde_amqp
@@ -83,14 +52,14 @@ serde_json
8352
serde_test
8453
serial_test
8554
sha2
55+
storage
8656
syn
8757
tar
8858
thiserror
8959
time
9060
tokio
9161
tracing
9262
tracing-subscriber
93-
tracing_subscriber
9463
typespec
9564
typespec
9665
typespec_client_core
@@ -100,9 +69,5 @@ typespec_macros
10069
ureq
10170
url
10271
uuid
103-
wasm-bindgen-futures
104-
wasm-bindgen-test
105-
wasm_bindgen_futures
106-
wasm_bindgen_test
10772
zerofrom
10873
zip

eng/scripts/update-cratenames.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,7 @@ fn main() {
2929
.dependencies
3030
.as_ref()
3131
.expect("expected workspace dependencies");
32-
let mut crate_names: Vec<String> = Vec::new();
33-
for (name, _) in dependencies.iter() {
34-
let name = name.to_string();
35-
if name.contains('-') {
36-
// When used in Rust code, hyphens are replaced with underscores.
37-
crate_names.push(name.replace('-', "_"));
38-
}
39-
crate_names.push(name);
40-
}
32+
let mut crate_names: Vec<String> = dependencies.iter().map(|(name, _)| name.to_string()).collect();
4133

4234
// Extract workspace members.
4335
for relative_path in workspace_manifest
@@ -53,7 +45,6 @@ fn main() {
5345
.and_then(OsStr::to_str)
5446
.expect("expected crate name")
5547
.to_string();
56-
5748
crate_names.push(crate_name);
5849
}
5950

sdk/core/azure_core/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ reqwest.workspace = true
4949
thiserror.workspace = true
5050
tokio.workspace = true
5151
tracing-subscriber.workspace = true
52-
ureq.workspace = true
52+
ureq = { version = "3", default-features = false, features = [
53+
"gzip",
54+
"native-tls",
55+
] }
5356

5457
[features]
5558
default = [

sdk/core/azure_core_test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async-trait.workspace = true
2323
azure_core = { workspace = true, features = ["test"] }
2424
azure_core_test_macros.workspace = true
2525
azure_identity.workspace = true
26-
dotenvy.workspace = true
26+
dotenvy = "0.15.7"
2727
futures.workspace = true
2828
rand.workspace = true
2929
rand_chacha.workspace = true

0 commit comments

Comments
 (0)