Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 3e0d420

Browse files
authored
Remove xml-rs dependency (#2936)
1 parent cc08109 commit 3e0d420

File tree

10 files changed

+60
-79
lines changed

10 files changed

+60
-79
lines changed

src/agent/Cargo.lock

Lines changed: 22 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/agent/cobertura/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ license = "MIT"
66

77
[dependencies]
88
anyhow = "1.0"
9-
quick-xml = "0.27.1"
9+
quick-xml = "0.28"

src/agent/onefuzz-file-format/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT"
88
anyhow = "1.0"
99
coverage = { path = "../coverage" }
1010
debuggable-module = { path = "../debuggable-module" }
11-
quick-xml = "0.27.1"
11+
quick-xml = "0.28"
1212
serde = { version = "1.0", features = ["derive"] }
1313
serde_json = { version = "1.0", features = ["preserve_order"] }
1414

src/agent/onefuzz-task/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ reqwest = { version = "0.11", features = [
3535
], default-features = false }
3636
serde = "1.0"
3737
serde_json = "1.0"
38-
serde-xml-rs = "0.6"
3938
onefuzz = { path = "../onefuzz" }
4039
onefuzz-telemetry = { path = "../onefuzz-telemetry" }
4140
path-absolutize = "3.0"
@@ -58,13 +57,13 @@ chrono = { version = "0.4", default-features = false, features = [
5857
] }
5958
ipc-channel = { git = "https://github.com/servo/ipc-channel", rev = "7f432aa" }
6059

61-
azure_core = { version = "0.10", default-features = false, features = [
60+
azure_core = { version = "0.11", default-features = false, features = [
6261
"enable_reqwest",
6362
] }
64-
azure_storage = { version = "0.10", default-features = false, features = [
63+
azure_storage = { version = "0.11", default-features = false, features = [
6564
"enable_reqwest",
6665
] }
67-
azure_storage_blobs = { version = "0.10", default-features = false, features = [
66+
azure_storage_blobs = { version = "0.11", default-features = false, features = [
6867
"enable_reqwest",
6968
] }
7069

src/agent/srcview/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nom = "7"
1515
pdb = "0.8"
1616
regex = "1"
1717
serde = { version = "1", features = ["derive"] }
18-
quick-xml = "0.27"
18+
quick-xml = "0.28"
1919
anyhow = "1.0"
2020
env_logger = "0.10"
2121
clap = { version = "4.1.6", features = ["derive"] }

src/agent/storage-queue/Cargo.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@ bytes = { version = "1.2", features = ["serde"] }
1414
derivative = "2.2"
1515
flume = "0.10"
1616
num_cpus = "1.15"
17+
quick-xml = { version = "0.28", features = ["serialize", "serde-types"] }
1718
regex = "1.7.1"
18-
reqwest = { version = "0.11", features = ["json", "stream", "native-tls-vendored"], default-features=false }
19+
reqwest = { version = "0.11", features = [
20+
"json",
21+
"stream",
22+
"native-tls-vendored",
23+
], default-features = false }
1924
reqwest-retry = { path = "../reqwest-retry" }
20-
serde = { version = "1.0", features = ["derive"]}
25+
serde = { version = "1.0", features = ["derive"] }
2126
serde_derive = "1.0"
2227
serde_json = "1.0"
23-
serde-xml-rs = "0.6"
2428
bincode = "1.3"
25-
tokio = { version = "1.24" , features=["full"] }
29+
tokio = { version = "1.24", features = ["full"] }
2630
queue-file = "1.4"
2731
uuid = { version = "0.8", features = ["serde", "v4"] }

src/agent/storage-queue/src/azure_queue.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,11 @@ impl AzureQueueClient {
131131

132132
pub async fn enqueue(&self, data: impl Serialize) -> Result<()> {
133133
let serialized = serde_json::to_string(&data).unwrap();
134-
let body = serde_xml_rs::to_string(&AzureQueueMessageSend {
134+
let body = quick_xml::se::to_string(&AzureQueueMessageSend {
135135
message_text: base64::encode(&serialized),
136-
})?;
136+
})
137+
.context("serializing queue message")?;
138+
137139
self.http
138140
.post(self.messages_url.clone())
139141
.body(body)
@@ -165,7 +167,8 @@ impl AzureQueueClient {
165167
}
166168
};
167169

168-
let msg: AzureQueueMessageList = serde_xml_rs::from_reader(buf.reader())?;
170+
let msg: AzureQueueMessageList =
171+
quick_xml::de::from_reader(buf.reader()).context("deserializing queue message")?;
169172

170173
let m = msg.queue_message.map(|msg| AzureQueueMessage {
171174
messages_url: Some(self.messages_url.clone()),

src/agent/storage-queue/src/local_queue.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ impl FileQueueClient {
6262

6363
pub async fn enqueue(&self, data: impl Serialize) -> Result<()> {
6464
let send_data = || async {
65-
let mut buffer = Vec::new();
66-
serde_xml_rs::to_writer(&mut buffer, &data)
65+
let mut buffer = String::new();
66+
quick_xml::se::to_writer(&mut buffer, &data)
6767
.map_err(|_| anyhow::anyhow!("unable to deserialize"))?;
6868
let mut locked_q = self
6969
.queue
7070
.lock()
7171
.map_err(|_| anyhow::anyhow!("unable to acquire lock"))?;
7272
locked_q
73-
.add(buffer.as_slice())
73+
.add(buffer.as_bytes())
7474
.map_err(|_| anyhow::anyhow!("unable to queue message"))?;
7575
Ok(())
7676
};

src/deny.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ unmaintained = "deny"
1515
unsound = "deny"
1616
yanked = "deny"
1717
ignore = [
18-
"RUSTSEC-2022-0048", # xml-rs is unmaintained
1918
"RUSTSEC-2023-0018",
2019
"RUSTSEC-2020-0016", # There is a PR currently open to stop using the unmaintained crate: https://github.com/servo/ipc-channel/pull/302
2120
]

src/proxy-manager/Cargo.lock

Lines changed: 15 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)