Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rosrust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ hostname = "0.3.1"
regex = "1.5.4"
serde = "1.0.127"
serde_derive = "1.0.127"
xml-rpc = "0.1.0"
xml-rpc = "0.2.0"
yaml-rust = "0.4.5"
crossbeam = "0.8.1"
socket2 = "0.4.1"
Expand Down
2 changes: 1 addition & 1 deletion rosrust/src/api/slave/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ impl SlaveHandler {
addr: &SocketAddr,
) -> rosxmlrpc::error::Result<
xml_rpc::server::BoundServer<
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static,
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static + use<'_>,
>,
> {
self.server.bind(addr).map_err(Into::into)
Expand Down
4 changes: 1 addition & 3 deletions rosrust/src/api/slave/subscriptions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,7 @@ fn request_topic(
let (_code, _message, protocols): (i32, String, (String, String, i32)) = xml_rpc::Client::new()
.map_err(error::rosxmlrpc::ErrorKind::ForeignXmlRpc)?
.call(
&publisher_uri
.parse()
.chain_err(|| error::rosxmlrpc::ErrorKind::BadUri(publisher_uri.into()))?,
&publisher_uri,
"requestTopic",
(caller_id, topic, [["TCPROS"]]),
)
Expand Down
2 changes: 1 addition & 1 deletion rosrust/src/rosxmlrpc/client.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::error::{ErrorKind, Result, ResultExt};
use super::{Response, ResponseError, ResponseInfo};
use serde::{Deserialize, Serialize};
use xml_rpc::{self, Params, Url, Value};
use xml_rpc::{self, Params, reqwest::Url, Value};

pub struct Client {
master_uri: Url,
Expand Down
2 changes: 1 addition & 1 deletion rosrust/src/rosxmlrpc/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl Server {
uri: &SocketAddr,
) -> xml_rpc::error::Result<
xml_rpc::server::BoundServer<
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static,
impl Fn(&rouille::Request) -> rouille::Response + Send + Sync + 'static + use<'_>,
>,
> {
self.server.bind(uri)
Expand Down