Skip to content

Commit b216fe0

Browse files
committed
update to xml-rpc 0.2.0
this updates to the latest `xml-rpc` version. note that at the moment this does not yet build since it hasn't been released yet. this requires adnanademovic/xml-rpc-rs#11 to be merged & released first. for the time being you can use this by using `[patch.crates-io]` in your `Cargo.toml` and overwrite both `rosrust` and `xml-rpc`. this update is needed to resolve various security vulnerabilities coming from outdated versions of `hyper` which are being pulled in via `xml-rpc`. with this, `cargo-audit` is happy again.
1 parent d124a69 commit b216fe0

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

rosrust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ hostname = "0.3.1"
1818
regex = "1.5.4"
1919
serde = "1.0.127"
2020
serde_derive = "1.0.127"
21-
xml-rpc = "0.1.0"
21+
xml-rpc = "0.2.0"
2222
yaml-rust = "0.4.5"
2323
crossbeam = "0.8.1"
2424
socket2 = "0.4.1"

rosrust/src/api/slave/handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ impl SlaveHandler {
240240
addr: &SocketAddr,
241241
) -> rosxmlrpc::error::Result<
242242
xml_rpc::server::BoundServer<
243-
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static,
243+
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static + use<'_>,
244244
>,
245245
> {
246246
self.server.bind(addr).map_err(Into::into)

rosrust/src/api/slave/subscriptions.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,7 @@ fn request_topic(
156156
let (_code, _message, protocols): (i32, String, (String, String, i32)) = xml_rpc::Client::new()
157157
.map_err(error::rosxmlrpc::ErrorKind::ForeignXmlRpc)?
158158
.call(
159-
&publisher_uri
160-
.parse()
161-
.chain_err(|| error::rosxmlrpc::ErrorKind::BadUri(publisher_uri.into()))?,
159+
&publisher_uri,
162160
"requestTopic",
163161
(caller_id, topic, [["TCPROS"]]),
164162
)

rosrust/src/rosxmlrpc/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::error::{ErrorKind, Result, ResultExt};
22
use super::{Response, ResponseError, ResponseInfo};
33
use serde::{Deserialize, Serialize};
4-
use xml_rpc::{self, Params, Url, Value};
4+
use xml_rpc::{self, Params, reqwest::Url, Value};
55

66
pub struct Client {
77
master_uri: Url,

rosrust/src/rosxmlrpc/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl Server {
3535
uri: &SocketAddr,
3636
) -> xml_rpc::error::Result<
3737
xml_rpc::server::BoundServer<
38-
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static,
38+
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static + use<'_>,
3939
>,
4040
> {
4141
self.server.bind(uri)

0 commit comments

Comments
 (0)