From 41e5d27ac962030f6bf829bcd0242c3cc7163721 Mon Sep 17 00:00:00 2001 From: Martin Dahl Date: Thu, 29 Jul 2021 11:06:11 +0200 Subject: [PATCH] rustfmt --- examples/parameters.rs | 5 +++-- src/lib.rs | 32 +++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/examples/parameters.rs b/examples/parameters.rs index 3d2b2ea..b7d5d32 100644 --- a/examples/parameters.rs +++ b/examples/parameters.rs @@ -19,13 +19,14 @@ fn main() -> Result<(), Box> { let mut i = 0; loop { node.spin_once(std::time::Duration::from_millis(100)); - if i % 20 == 0 { // every 2 seconds print all parameters + if i % 20 == 0 { + // every 2 seconds print all parameters println!("node parameters"); node.params.lock().unwrap().iter().for_each(|(k, v)| { println!("{} - {:?}", k, v); }); } - i+=1; + i += 1; if i > 1000 { break; } diff --git a/src/lib.rs b/src/lib.rs index c3f3b95..d6b8a15 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1696,7 +1696,7 @@ impl ParameterValue { _ => { println!("warning: malformed parametervalue message"); ParameterValue::NotSet - }, + } } } } @@ -1867,20 +1867,22 @@ impl Node { fn setup_parameter_services(&mut self) -> Result<()> { let node_name = self.name()?; let params_cb = self.params.clone(); - self.create_service::(&format!("{}/set_parameters", node_name), - Box::new(move |req: rcl_interfaces::srv::SetParameters::Request| { - let mut result = rcl_interfaces::srv::SetParameters::Response::default(); - for p in req.parameters { - let val = ParameterValue::from_parameter_value_msg(p.value); - params_cb.lock().unwrap().insert(p.name, val); - let r = rcl_interfaces::msg::SetParametersResult { - successful: true, - reason: "".into(), - }; - result.results.push(r); - } - result - }))?; + self.create_service::( + &format!("{}/set_parameters", node_name), + Box::new(move |req: rcl_interfaces::srv::SetParameters::Request| { + let mut result = rcl_interfaces::srv::SetParameters::Response::default(); + for p in req.parameters { + let val = ParameterValue::from_parameter_value_msg(p.value); + params_cb.lock().unwrap().insert(p.name, val); + let r = rcl_interfaces::msg::SetParametersResult { + successful: true, + reason: "".into(), + }; + result.results.push(r); + } + result + }), + )?; Ok(()) }