New rustfmt.toml

r2r/benches/deserialization.rs

@@ -1,7 +1,6 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use r2r::*;
-use rand::thread_rng;
-use rand::Rng;
+use rand::{thread_rng, Rng};
 
 const NUM_ELEMENTS: usize = 10_000;
 const NUM_TIMES: usize = 1_000;

r2r/build.rs

@@ -7,8 +7,10 @@ use {
     std::io::{self, prelude::*, BufWriter},
 };
 
-use std::path::{Path, PathBuf};
-use std::{env, fs};
+use std::{
+    env, fs,
+    path::{Path, PathBuf},
+};
 
 #[cfg(feature = "doc-only")]
 mod filenames {

r2r/examples/action_client.rs

@@ -1,7 +1,4 @@
-use futures::executor::LocalPool;
-use futures::future::FutureExt;
-use futures::stream::StreamExt;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, future::FutureExt, stream::StreamExt, task::LocalSpawnExt};
 
 use r2r::example_interfaces::action::Fibonacci;
 use std::sync::{Arc, Mutex};

r2r/examples/action_client_untyped.rs

@@ -1,10 +1,7 @@
 //
 // This example is the same as action_client.rs but stripped of all (explicit) type information.
 //
-use futures::executor::LocalPool;
-use futures::future::FutureExt;
-use futures::stream::StreamExt;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, future::FutureExt, stream::StreamExt, task::LocalSpawnExt};
 
 use std::sync::{Arc, Mutex};
 

r2r/examples/action_server.rs

@@ -1,7 +1,9 @@
-use futures::executor::{LocalPool, LocalSpawner};
-use futures::future::{self, Either};
-use futures::stream::{Stream, StreamExt};
-use futures::task::LocalSpawnExt;
+use futures::{
+    executor::{LocalPool, LocalSpawner},
+    future::{self, Either},
+    stream::{Stream, StreamExt},
+    task::LocalSpawnExt,
+};
 
 use r2r::example_interfaces::action::Fibonacci;
 use std::sync::{Arc, Mutex};

r2r/examples/client.rs

@@ -1,6 +1,4 @@
-use futures::executor::LocalPool;
-use futures::task::LocalSpawnExt;
-use futures::Future;
+use futures::{executor::LocalPool, task::LocalSpawnExt, Future};
 
 use std::io::Write;
 

r2r/examples/parameters.rs

@@ -1,6 +1,4 @@
-use futures::executor::LocalPool;
-use futures::prelude::*;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, prelude::*, task::LocalSpawnExt};
 
 // try to run like this
 // cargo run --example parameters -- --ros-args -p key1:=[hello,world] -p key2:=5.5 -r __ns:=/demo -r __node:=my_node

r2r/examples/parameters_derive.rs

@@ -1,6 +1,4 @@
-use futures::executor::LocalPool;
-use futures::prelude::*;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, prelude::*, task::LocalSpawnExt};
 use r2r::RosParams;
 use std::sync::{Arc, Mutex};
 

r2r/examples/publishers.rs

@@ -1,7 +1,6 @@
-use r2r::builtin_interfaces::msg::Duration;
-use r2r::std_msgs::msg::Int32;
-use r2r::trajectory_msgs::msg::*;
-use r2r::QosProfile;
+use r2r::{
+    builtin_interfaces::msg::Duration, std_msgs::msg::Int32, trajectory_msgs::msg::*, QosProfile,
+};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let ctx = r2r::Context::create()?;

r2r/examples/rostopic_echo.rs

@@ -1,12 +1,7 @@
-use futures::executor::LocalPool;
-use futures::future;
-use futures::stream::StreamExt;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, future, stream::StreamExt, task::LocalSpawnExt};
 use r2r::QosProfile;
 
-use std::collections::HashMap;
-use std::env;
-use std::thread;
+use std::{collections::HashMap, env, thread};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let ctx = r2r::Context::create()?;

r2r/examples/rostopic_list.rs

@@ -1,5 +1,4 @@
-use std::thread;
-use std::time::Duration;
+use std::{thread, time::Duration};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let ctx = r2r::Context::create()?;

r2r/examples/service.rs

@@ -1,8 +1,4 @@
-use futures::executor::LocalPool;
-use futures::select;
-use futures::stream::StreamExt;
-use futures::task::LocalSpawnExt;
-use futures::FutureExt;
+use futures::{executor::LocalPool, select, stream::StreamExt, task::LocalSpawnExt, FutureExt};
 
 use r2r::example_interfaces::srv::AddTwoInts;
 
@@ -12,7 +8,6 @@ use r2r::example_interfaces::srv::AddTwoInts;
 /// Run toghtether with the client example.
 /// e.g. cargo run --example service
 /// and in another terminal cargo run --example client
-///
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let ctx = r2r::Context::create()?;
     let mut node = r2r::Node::create(ctx, "testnode", "")?;

r2r/examples/sim_time_publisher.rs

@@ -1,5 +1,4 @@
-use r2r::ClockType::SystemTime;
-use r2r::{Clock, QosProfile};
+use r2r::{Clock, ClockType::SystemTime, QosProfile};
 use std::time::Duration;
 
 /// Simple publisher publishing time starting at time 0 every `SENDING_PERIOD`

r2r/examples/subscriber.rs

@@ -1,7 +1,4 @@
-use futures::executor::LocalPool;
-use futures::future;
-use futures::stream::StreamExt;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, future, stream::StreamExt, task::LocalSpawnExt};
 use r2r::QosProfile;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {

r2r/examples/timer_sim_time.rs

@@ -1,10 +1,11 @@
-use futures::executor::LocalPool;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, task::LocalSpawnExt};
 
 use r2r::{Clock, ClockType};
-use std::cell::RefCell;
-use std::rc::Rc;
-use std::sync::{Arc, Mutex};
+use std::{
+    cell::RefCell,
+    rc::Rc,
+    sync::{Arc, Mutex},
+};
 
 async fn timer_task(
     mut t: r2r::Timer, ros_clock: Arc<Mutex<Clock>>, mut system_clock: Clock,

r2r/examples/tokio.rs

@@ -1,5 +1,4 @@
-use futures::future;
-use futures::stream::StreamExt;
+use futures::{future, stream::StreamExt};
 use r2r::QosProfile;
 
 use std::sync::{Arc, Mutex};

r2r/examples/tokio_examples.rs

@@ -1,7 +1,6 @@
 use std::sync::{Arc, Mutex};
 
-use futures::future;
-use futures::stream::StreamExt;
+use futures::{future, stream::StreamExt};
 
 use r2r::QosProfile;
 use tokio::task;

r2r/examples/tokio_raw_publisher.rs

@@ -1,5 +1,4 @@
-use r2r::QosProfile;
-use r2r::WrappedTypesupport;
+use r2r::{QosProfile, WrappedTypesupport};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

r2r/examples/tokio_raw_subscriber.rs

@@ -1,7 +1,5 @@
-use futures::future;
-use futures::stream::StreamExt;
-use r2r::QosProfile;
-use r2r::WrappedTypesupport;
+use futures::{future, stream::StreamExt};
+use r2r::{QosProfile, WrappedTypesupport};
 use serde::{Deserialize, Serialize};
 
 #[tokio::main]

r2r/examples/tokio_subscriber.rs

@@ -1,5 +1,4 @@
-use futures::future;
-use futures::stream::StreamExt;
+use futures::{future, stream::StreamExt};
 use r2r::QosProfile;
 
 #[tokio::main]

r2r/examples/untyped_client.rs

@@ -1,6 +1,4 @@
-use futures::executor::LocalPool;
-use futures::task::LocalSpawnExt;
-use futures::Future;
+use futures::{executor::LocalPool, task::LocalSpawnExt, Future};
 
 async fn requester_task(
     node_available: impl Future<Output = r2r::Result<()>>, c: r2r::ClientUntyped,

r2r/examples/wall_timer.rs

@@ -1,8 +1,6 @@
-use futures::executor::LocalPool;
-use futures::task::LocalSpawnExt;
+use futures::{executor::LocalPool, task::LocalSpawnExt};
 
-use std::cell::RefCell;
-use std::rc::Rc;
+use std::{cell::RefCell, rc::Rc};
 
 async fn timer_task(mut t: r2r::Timer) -> Result<(), Box<dyn std::error::Error>> {
     let mut x: i32 = 0;

r2r/src/action_clients.rs

@@ -1,16 +1,24 @@
-use futures::channel::{mpsc, oneshot};
-use futures::future::{FutureExt, TryFutureExt};
-use futures::stream::Stream;
-use std::collections::HashMap;
-use std::ffi::CString;
-use std::future::Future;
-use std::mem::MaybeUninit;
-use std::sync::{Mutex, Weak};
-
-use crate::action_common::*;
-use crate::error::*;
-use crate::msg_types::generated_msgs::{action_msgs, builtin_interfaces, unique_identifier_msgs};
-use crate::msg_types::*;
+use futures::{
+    channel::{mpsc, oneshot},
+    future::{FutureExt, TryFutureExt},
+    stream::Stream,
+};
+use std::{
+    collections::HashMap,
+    ffi::CString,
+    future::Future,
+    mem::MaybeUninit,
+    sync::{Mutex, Weak},
+};
+
+use crate::{
+    action_common::*,
+    error::*,
+    msg_types::{
+        generated_msgs::{action_msgs, builtin_interfaces, unique_identifier_msgs},
+        *,
+    },
+};
 use r2r_actions::*;
 use r2r_rcl::*;
 

r2r/src/action_clients_untyped.rs

@@ -1,16 +1,24 @@
-use futures::channel::{mpsc, oneshot};
-use futures::future::{FutureExt, TryFutureExt};
-use futures::stream::Stream;
-use std::collections::HashMap;
-use std::future::Future;
-use std::mem::MaybeUninit;
-use std::sync::{Mutex, Weak};
-
-use crate::action_clients::*;
-use crate::action_common::*;
-use crate::error::*;
-use crate::msg_types::generated_msgs::{action_msgs, builtin_interfaces, unique_identifier_msgs};
-use crate::msg_types::*;
+use futures::{
+    channel::{mpsc, oneshot},
+    future::{FutureExt, TryFutureExt},
+    stream::Stream,
+};
+use std::{
+    collections::HashMap,
+    future::Future,
+    mem::MaybeUninit,
+    sync::{Mutex, Weak},
+};
+
+use crate::{
+    action_clients::*,
+    action_common::*,
+    error::*,
+    msg_types::{
+        generated_msgs::{action_msgs, builtin_interfaces, unique_identifier_msgs},
+        *,
+    },
+};
 use r2r_actions::*;
 use r2r_rcl::*;
 //

r2r/src/action_servers.rs

@@ -1,15 +1,22 @@
-use futures::channel::{mpsc, oneshot};
-use futures::future::FutureExt;
-use futures::future::{join_all, JoinAll};
-use futures::stream::Stream;
-use std::collections::HashMap;
-use std::ffi::CString;
-use std::mem::MaybeUninit;
-use std::sync::{Arc, Mutex, Weak};
-
-use crate::error::*;
-use crate::msg_types::generated_msgs::{action_msgs, builtin_interfaces, unique_identifier_msgs};
-use crate::msg_types::*;
+use futures::{
+    channel::{mpsc, oneshot},
+    future::{join_all, FutureExt, JoinAll},
+    stream::Stream,
+};
+use std::{
+    collections::HashMap,
+    ffi::CString,
+    mem::MaybeUninit,
+    sync::{Arc, Mutex, Weak},
+};
+
+use crate::{
+    error::*,
+    msg_types::{
+        generated_msgs::{action_msgs, builtin_interfaces, unique_identifier_msgs},
+        *,
+    },
+};
 use r2r_actions::*;
 use r2r_rcl::*;
 

r2r/src/clients.rs

@@ -1,12 +1,12 @@
-use futures::channel::oneshot;
-use futures::TryFutureExt;
-use std::ffi::CString;
-use std::future::Future;
-use std::mem::MaybeUninit;
-use std::sync::{Mutex, Weak};
-
-use crate::error::*;
-use crate::msg_types::*;
+use futures::{channel::oneshot, TryFutureExt};
+use std::{
+    ffi::CString,
+    future::Future,
+    mem::MaybeUninit,
+    sync::{Mutex, Weak},
+};
+
+use crate::{error::*, msg_types::*};
 use r2r_rcl::*;
 
 /// ROS service client.

r2r/src/clocks.rs

@@ -1,9 +1,6 @@
-use std::fmt::Debug;
-use std::mem::MaybeUninit;
-use std::time::Duration;
+use std::{fmt::Debug, mem::MaybeUninit, time::Duration};
 
-use crate::error::*;
-use crate::msg_types::generated_msgs::builtin_interfaces;
+use crate::{error::*, msg_types::generated_msgs::builtin_interfaces};
 use r2r_rcl::*;
 
 /// Different ROS clock types.

r2r/src/context.rs

@@ -1,12 +1,11 @@
-use std::ffi::CStr;
-use std::ffi::CString;
-use std::fmt::Debug;
-use std::ops::{Deref, DerefMut};
-use std::sync::OnceLock;
-use std::sync::{Arc, Mutex};
-
-use crate::error::*;
-use crate::log_guard;
+use std::{
+    ffi::{CStr, CString},
+    fmt::Debug,
+    ops::{Deref, DerefMut},
+    sync::{Arc, Mutex, OnceLock},
+};
+
+use crate::{error::*, log_guard};
 use r2r_rcl::*;
 
 /// A ROS context. Needed to create nodes etc.