Skip to content

Commit 60e2c52

Browse files
authored
undo crate dep reorganization
1 parent b63c0b3 commit 60e2c52

File tree

5 files changed

+8
-54
lines changed

5 files changed

+8
-54
lines changed

Cargo.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ members = [
1313
"sdk/core/azure_core_test_macros",
1414
"sdk/core/azure_core_opentelemetry",
1515
"sdk/cosmos/azure_data_cosmos",
16-
"sdk/cosmos/azure_data_cosmos_native",
1716
"sdk/identity/azure_identity",
1817
"sdk/eventhubs/azure_messaging_eventhubs",
1918
"sdk/eventhubs/azure_messaging_eventhubs_checkpointstore_blob",
@@ -96,10 +95,8 @@ async-trait = "0.1"
9695
base64 = "0.22"
9796
bytes = "1.0"
9897
cargo_metadata = "0.18.1"
99-
cbindgen = "0.29.0"
10098
clap = { version = "4.5.45", features = ["derive"] }
10199
criterion = { version = "0.5", features = ["async_tokio"] }
102-
dotenvy = "0.15.7"
103100
dyn-clone = "1.0"
104101
fe2o3-amqp = { version = "0.14", features = ["uuid"] }
105102
fe2o3-amqp-ext = { version = "0.14" }
@@ -150,10 +147,6 @@ tracing = "0.1.40"
150147
tracing-subscriber = "0.3"
151148
url = "2.2"
152149
uuid = { version = "1.18", features = ["v4"] }
153-
ureq = { version = "3", default-features = false, features = [
154-
"gzip",
155-
"native-tls",
156-
] }
157150
wasm-bindgen-futures = "0.4"
158151
wasm-bindgen-test = "0.3"
159152
zerofrom = "0.1.5"

eng/dict/crates.txt

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,18 @@
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
@@ -34,46 +22,29 @@ azure_template_core
3422
base64
3523
bytes
3624
cargo_metadata
37-
cbindgen
3825
clap
39-
criterion
4026
dotenvy
4127
dyn-clone
42-
dyn_clone
4328
fe2o3-amqp
4429
fe2o3-amqp-cbs
4530
fe2o3-amqp-ext
4631
fe2o3-amqp-management
4732
fe2o3-amqp-types
48-
fe2o3_amqp
49-
fe2o3_amqp_cbs
50-
fe2o3_amqp_ext
51-
fe2o3_amqp_management
52-
fe2o3_amqp_types
5333
flate2
5434
futures
5535
getrandom
56-
gloo-timers
57-
gloo_timers
36+
gloo
5837
hmac
5938
litemap
6039
log
6140
openssl
62-
opentelemetry
63-
opentelemetry-http
64-
opentelemetry_http
65-
opentelemetry_sdk
6641
pin-project
67-
pin_project
6842
proc-macro2
69-
proc_macro2
7043
quick-xml
71-
quick_xml
7244
quote
7345
rand
7446
rand_chacha
7547
reqwest
76-
rust_decimal
7748
rustc_version
7849
serde
7950
serde_amqp
@@ -82,14 +53,14 @@ serde_json
8253
serde_test
8354
serial_test
8455
sha2
56+
storage
8557
syn
8658
tar
8759
thiserror
8860
time
8961
tokio
9062
tracing
9163
tracing-subscriber
92-
tracing_subscriber
9364
typespec
9465
typespec
9566
typespec_client_core
@@ -99,9 +70,5 @@ typespec_macros
9970
ureq
10071
url
10172
uuid
102-
wasm-bindgen-futures
103-
wasm-bindgen-test
104-
wasm_bindgen_futures
105-
wasm_bindgen_test
10673
zerofrom
10774
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)