diff --git a/rclrust-msg-gen/src/parser/action.rs b/rclrust-msg-gen/src/parser/action.rs
index b317e40b..c408e630 100644
--- a/rclrust-msg-gen/src/parser/action.rs
+++ b/rclrust-msg-gen/src/parser/action.rs
@@ -1,11 +1,9 @@
-use std::fs;
-use std::path::Path;
+use std::{fs, path::Path};
 
 use anyhow::{Context, Result};
 use regex::Regex;
 
-use super::error::RclMsgError;
-use super::message::parse_message_string;
+use super::{error::RclMsgError, message::parse_message_string};
 use crate::types::Action;
 
 const ACTION_GOAL_SUFFIX: &str = "_Goal";
@@ -62,9 +60,7 @@ mod test {
     use std::path::PathBuf;
 
     use super::*;
-    use crate::types::primitives::*;
-    use crate::types::sequences::*;
-    use crate::types::MemberType;
+    use crate::types::{primitives::*, sequences::*, MemberType};
 
     fn parse_action_def(srv_name: &str) -> Result<Action> {
         let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
diff --git a/rclrust-msg-gen/src/parser/constant.rs b/rclrust-msg-gen/src/parser/constant.rs
index 5960df30..08cffdbc 100644
--- a/rclrust-msg-gen/src/parser/constant.rs
+++ b/rclrust-msg-gen/src/parser/constant.rs
@@ -1,14 +1,14 @@
 use anyhow::{ensure, Result};
-use nom::bytes::complete::is_not;
-use nom::character::complete::{char, space0, space1};
-use nom::combinator::{eof, recognize};
-use nom::multi::separated_list1;
-use nom::sequence::tuple;
+use nom::{
+    bytes::complete::is_not,
+    character::complete::{char, space0, space1},
+    combinator::{eof, recognize},
+    multi::separated_list1,
+    sequence::tuple,
+};
 
-use super::error::RclMsgError;
-use super::{ident, literal, types};
-use crate::types::primitives::PrimitiveType;
-use crate::types::{Constant, ConstantType};
+use super::{error::RclMsgError, ident, literal, types};
+use crate::types::{primitives::PrimitiveType, Constant, ConstantType};
 
 fn validate_value(r#type: ConstantType, value: &str) -> Result<Vec<String>> {
     match r#type {
diff --git a/rclrust-msg-gen/src/parser/ident.rs b/rclrust-msg-gen/src/parser/ident.rs
index 5e339424..8f1fbb2a 100644
--- a/rclrust-msg-gen/src/parser/ident.rs
+++ b/rclrust-msg-gen/src/parser/ident.rs
@@ -1,9 +1,11 @@
-use nom::branch::alt;
-use nom::character::complete::{alphanumeric0, char, one_of};
-use nom::combinator::{opt, recognize};
-use nom::multi::{many1, separated_list0, separated_list1};
-use nom::sequence::{pair, tuple};
-use nom::IResult;
+use nom::{
+    branch::alt,
+    character::complete::{alphanumeric0, char, one_of},
+    combinator::{opt, recognize},
+    multi::{many1, separated_list0, separated_list1},
+    sequence::{pair, tuple},
+    IResult,
+};
 
 fn upperalpha(s: &str) -> IResult<&str, char> {
     one_of("ABCDEFGHIJKLMNOPQRSTUVWXYZ")(s)
diff --git a/rclrust-msg-gen/src/parser/literal.rs b/rclrust-msg-gen/src/parser/literal.rs
index 5b18750f..18645cfd 100644
--- a/rclrust-msg-gen/src/parser/literal.rs
+++ b/rclrust-msg-gen/src/parser/literal.rs
@@ -1,15 +1,15 @@
 use std::convert::TryFrom;
 
-use nom::branch::alt;
-use nom::bytes::complete::{is_not, tag, tag_no_case, take_while};
-use nom::character::complete::{
-    anychar, char, digit1, hex_digit1, none_of, oct_digit1, one_of, space0,
+use nom::{
+    branch::alt,
+    bytes::complete::{is_not, tag, tag_no_case, take_while},
+    character::complete::{anychar, char, digit1, hex_digit1, none_of, oct_digit1, one_of, space0},
+    combinator::{eof, map, map_res, opt, recognize, rest, value, verify},
+    multi::{many0, separated_list1},
+    number::complete::recognize_float,
+    sequence::{delimited, pair, tuple},
+    IResult,
 };
-use nom::combinator::{eof, map, map_res, opt, recognize, rest, value, verify};
-use nom::multi::{many0, separated_list1};
-use nom::number::complete::recognize_float;
-use nom::sequence::{delimited, pair, tuple};
-use nom::IResult;
 
 use crate::types::primitives::{BasicType, GenericString};
 
diff --git a/rclrust-msg-gen/src/parser/member.rs b/rclrust-msg-gen/src/parser/member.rs
index 07eff3e9..c52380e9 100644
--- a/rclrust-msg-gen/src/parser/member.rs
+++ b/rclrust-msg-gen/src/parser/member.rs
@@ -1,14 +1,14 @@
 use anyhow::{ensure, Result};
-use nom::bytes::complete::is_not;
-use nom::character::complete::{space0, space1};
-use nom::combinator::{eof, opt, recognize};
-use nom::multi::separated_list1;
-use nom::sequence::{preceded, tuple};
+use nom::{
+    bytes::complete::is_not,
+    character::complete::{space0, space1},
+    combinator::{eof, opt, recognize},
+    multi::separated_list1,
+    sequence::{preceded, tuple},
+};
 
-use super::error::RclMsgError;
-use super::{ident, literal, types};
-use crate::types::primitives::NestableType;
-use crate::types::{Member, MemberType};
+use super::{error::RclMsgError, ident, literal, types};
+use crate::types::{primitives::NestableType, Member, MemberType};
 
 fn nestable_type_default(nestable_type: NestableType, default: &str) -> Result<Vec<String>> {
     match nestable_type {
diff --git a/rclrust-msg-gen/src/parser/message.rs b/rclrust-msg-gen/src/parser/message.rs
index c4292c50..c961b973 100644
--- a/rclrust-msg-gen/src/parser/message.rs
+++ b/rclrust-msg-gen/src/parser/message.rs
@@ -1,10 +1,8 @@
-use std::fs;
-use std::path::Path;
+use std::{fs, path::Path};
 
 use anyhow::{Context, Result};
 
-use super::constant::constant_def;
-use super::member::member_def;
+use super::{constant::constant_def, member::member_def};
 use crate::types::Message;
 
 fn split_once(s: &'_ str, pat: char) -> (&'_ str, Option<&'_ str>) {
@@ -62,9 +60,7 @@ mod test {
     use std::path::PathBuf;
 
     use super::*;
-    use crate::types::primitives::*;
-    use crate::types::sequences::*;
-    use crate::types::*;
+    use crate::types::{primitives::*, sequences::*, *};
 
     #[test]
     fn test_split_once() {
diff --git a/rclrust-msg-gen/src/parser/package.rs b/rclrust-msg-gen/src/parser/package.rs
index e70f890f..3c3f7b9f 100644
--- a/rclrust-msg-gen/src/parser/package.rs
+++ b/rclrust-msg-gen/src/parser/package.rs
@@ -1,12 +1,12 @@
-use std::fs::{self, File};
-use std::io::{BufRead, BufReader};
-use std::path::Path;
+use std::{
+    fs::{self, File},
+    io::{BufRead, BufReader},
+    path::Path,
+};
 
 use anyhow::Result;
 
-use super::action::parse_action_file;
-use super::message::parse_message_file;
-use super::service::parse_service_file;
+use super::{action::parse_action_file, message::parse_message_file, service::parse_service_file};
 use crate::types::Package;
 
 const ROSIDL_INTERFACES: &str = "share/ament_index/resource_index/rosidl_interfaces";
diff --git a/rclrust-msg-gen/src/parser/service.rs b/rclrust-msg-gen/src/parser/service.rs
index f52fe4d1..81cf5f23 100644
--- a/rclrust-msg-gen/src/parser/service.rs
+++ b/rclrust-msg-gen/src/parser/service.rs
@@ -1,11 +1,9 @@
-use std::fs;
-use std::path::Path;
+use std::{fs, path::Path};
 
 use anyhow::{Context, Result};
 use regex::Regex;
 
-use super::error::RclMsgError;
-use super::message::parse_message_string;
+use super::{error::RclMsgError, message::parse_message_string};
 use crate::types::Service;
 
 const SERVICE_REQUEST_SUFFIX: &str = "_Request";
diff --git a/rclrust-msg-gen/src/parser/types.rs b/rclrust-msg-gen/src/parser/types.rs
index 6f92645c..c761ea04 100644
--- a/rclrust-msg-gen/src/parser/types.rs
+++ b/rclrust-msg-gen/src/parser/types.rs
@@ -1,16 +1,22 @@
 use anyhow::anyhow;
-use nom::branch::alt;
-use nom::bytes::complete::tag;
-use nom::character::complete::{char, space1};
-use nom::combinator::{eof, map, map_res, opt, peek};
-use nom::sequence::{delimited, pair, preceded, tuple};
-use nom::IResult;
+use nom::{
+    branch::alt,
+    bytes::complete::tag,
+    character::complete::{char, space1},
+    combinator::{eof, map, map_res, opt, peek},
+    sequence::{delimited, pair, preceded, tuple},
+    IResult,
+};
 
-use super::ident::{message_name, package_name};
-use super::literal::usize_literal;
-use crate::types::primitives::*;
-use crate::types::sequences::{Array, BoundedSequence, PrimitiveArray, Sequence};
-use crate::types::{ConstantType, MemberType};
+use super::{
+    ident::{message_name, package_name},
+    literal::usize_literal,
+};
+use crate::types::{
+    primitives::*,
+    sequences::{Array, BoundedSequence, PrimitiveArray, Sequence},
+    ConstantType, MemberType,
+};
 
 pub fn parse_member_type(s: &str) -> IResult<&str, MemberType> {
     map_res(
diff --git a/rclrust-msg-gen/src/types/action.rs b/rclrust-msg-gen/src/types/action.rs
index 418becf2..0b64e86e 100644
--- a/rclrust-msg-gen/src/types/action.rs
+++ b/rclrust-msg-gen/src/types/action.rs
@@ -1,8 +1,7 @@
 use heck::SnakeCase;
 use quote::{format_ident, quote, ToTokens};
 
-use super::primitives::*;
-use super::{Member, Message, Service};
+use super::{primitives::*, Member, Message, Service};
 
 /// An action definition
 #[derive(Debug, Clone)]
diff --git a/rclrust-msg-gen/src/types/constant.rs b/rclrust-msg-gen/src/types/constant.rs
index 03458d21..fe482bbf 100644
--- a/rclrust-msg-gen/src/types/constant.rs
+++ b/rclrust-msg-gen/src/types/constant.rs
@@ -1,7 +1,9 @@
 use quote::{quote, ToTokens};
 
-use super::primitives::{BasicType, GenericUnboundedString, PrimitiveType};
-use super::sequences::PrimitiveArray;
+use super::{
+    primitives::{BasicType, GenericUnboundedString, PrimitiveType},
+    sequences::PrimitiveArray,
+};
 
 macro_rules! define_enum_from {
     ($into_t:ty, $from_t:ty, $path:path) => {
diff --git a/rclrust-msg-gen/src/types/member.rs b/rclrust-msg-gen/src/types/member.rs
index bd454aa3..943d5cbf 100644
--- a/rclrust-msg-gen/src/types/member.rs
+++ b/rclrust-msg-gen/src/types/member.rs
@@ -1,7 +1,6 @@
 use quote::{quote, ToTokens};
 
-use super::primitives::*;
-use super::sequences::*;
+use super::{primitives::*, sequences::*};
 
 macro_rules! define_enum_from {
     ($into_t:ty, $from_t:ty, $path:path) => {
diff --git a/rclrust-msg-gen/src/types/message.rs b/rclrust-msg-gen/src/types/message.rs
index 01deec80..1f83147e 100644
--- a/rclrust-msg-gen/src/types/message.rs
+++ b/rclrust-msg-gen/src/types/message.rs
@@ -1,9 +1,7 @@
 use heck::SnakeCase;
 use quote::{format_ident, quote, ToTokens};
 
-use super::primitives::*;
-use super::sequences::Array;
-use super::{ConstantType, MemberType};
+use super::{primitives::*, sequences::Array, ConstantType, MemberType};
 
 /// A member of a structure
 #[derive(Debug, Clone)]
diff --git a/rclrust-msg/src/_core/sequence.rs b/rclrust-msg/src/_core/sequence.rs
index 62a3d222..63d2e9f2 100644
--- a/rclrust-msg/src/_core/sequence.rs
+++ b/rclrust-msg/src/_core/sequence.rs
@@ -1,5 +1,4 @@
-use std::mem::ManuallyDrop;
-use std::ops::Deref;
+use std::{mem::ManuallyDrop, ops::Deref};
 
 use super::traits::{FFIFromRust, FFIToRust};
 
diff --git a/rclrust-msg/src/_core/string.rs b/rclrust-msg/src/_core/string.rs
index 34f27294..e6274a0c 100644
--- a/rclrust-msg/src/_core/string.rs
+++ b/rclrust-msg/src/_core/string.rs
@@ -1,5 +1,7 @@
-use std::ffi::{CStr, CString};
-use std::os::raw::c_char;
+use std::{
+    ffi::{CStr, CString},
+    os::raw::c_char,
+};
 
 use widestring::{U16CStr, U16CString, U16String};
 
diff --git a/rclrust-msg/src/_core/traits.rs b/rclrust-msg/src/_core/traits.rs
index 6aa3994a..bdb2c7f9 100644
--- a/rclrust-msg/src/_core/traits.rs
+++ b/rclrust-msg/src/_core/traits.rs
@@ -1,5 +1,4 @@
-use std::convert::TryInto;
-use std::os::raw::c_void;
+use std::{convert::TryInto, os::raw::c_void};
 
 use array_init::array_init;
 use widestring::U16String;
diff --git a/rclrust/examples/client.rs b/rclrust/examples/client.rs
index 358ef16f..819bfc48 100644
--- a/rclrust/examples/client.rs
+++ b/rclrust/examples/client.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
-use rclrust::qos::QoSProfile;
-use rclrust::rclrust_info;
+use rclrust::{qos::QoSProfile, rclrust_info};
 use rclrust_msg::example_interfaces::srv::{AddTwoInts, AddTwoInts_Request};
 
 fn main() -> Result<()> {
diff --git a/rclrust/examples/logger.rs b/rclrust/examples/logger.rs
index 99013dc9..451156ce 100644
--- a/rclrust/examples/logger.rs
+++ b/rclrust/examples/logger.rs
@@ -1,6 +1,7 @@
 use anyhow::Result;
-use rclrust::{rclrust_debug, rclrust_error, rclrust_fatal, rclrust_info, rclrust_warn};
-use rclrust::{Clock, Logger};
+use rclrust::{
+    rclrust_debug, rclrust_error, rclrust_fatal, rclrust_info, rclrust_warn, Clock, Logger,
+};
 use rclrust_msg::geometry_msgs::msg::Twist;
 
 fn main() -> Result<()> {
diff --git a/rclrust/examples/parameters.rs b/rclrust/examples/parameters.rs
index 5b38d6a6..d1fc4fa4 100644
--- a/rclrust/examples/parameters.rs
+++ b/rclrust/examples/parameters.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
-use rclrust::rclrust_info;
-use rclrust::{Parameter, ParameterValue};
+use rclrust::{rclrust_info, Parameter, ParameterValue};
 
 fn main() -> Result<()> {
     let ctx = rclrust::init()?;
diff --git a/rclrust/examples/publisher.rs b/rclrust/examples/publisher.rs
index 0273b81a..089972fb 100644
--- a/rclrust/examples/publisher.rs
+++ b/rclrust/examples/publisher.rs
@@ -1,9 +1,7 @@
-use std::thread::sleep;
-use std::time::Duration;
+use std::{thread::sleep, time::Duration};
 
 use anyhow::Result;
-use rclrust::qos::QoSProfile;
-use rclrust::rclrust_info;
+use rclrust::{qos::QoSProfile, rclrust_info};
 use rclrust_msg::std_msgs::msg::String as String_;
 
 fn main() -> Result<()> {
diff --git a/rclrust/examples/raw_subscription.rs b/rclrust/examples/raw_subscription.rs
index 3d420ac0..0546d3e2 100644
--- a/rclrust/examples/raw_subscription.rs
+++ b/rclrust/examples/raw_subscription.rs
@@ -1,8 +1,6 @@
 use anyhow::Result;
-use rclrust::qos::QoSProfile;
-use rclrust::rclrust_info;
-use rclrust_msg::_core::FFIToRust;
-use rclrust_msg::std_msgs::msg::String as String_;
+use rclrust::{qos::QoSProfile, rclrust_info};
+use rclrust_msg::{_core::FFIToRust, std_msgs::msg::String as String_};
 
 fn main() -> Result<()> {
     let ctx = rclrust::init()?;
diff --git a/rclrust/examples/subscription.rs b/rclrust/examples/subscription.rs
index 698d2225..e831d175 100644
--- a/rclrust/examples/subscription.rs
+++ b/rclrust/examples/subscription.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
-use rclrust::qos::QoSProfile;
-use rclrust::rclrust_info;
+use rclrust::{qos::QoSProfile, rclrust_info};
 use rclrust_msg::std_msgs::msg::String as String_;
 
 fn main() -> Result<()> {
diff --git a/rclrust/examples/timer.rs b/rclrust/examples/timer.rs
index c843c9dd..4d909481 100644
--- a/rclrust/examples/timer.rs
+++ b/rclrust/examples/timer.rs
@@ -1,5 +1,4 @@
-use std::cell::Cell;
-use std::time::Duration;
+use std::{cell::Cell, time::Duration};
 
 use anyhow::Result;
 use rclrust::rclrust_info;
diff --git a/rclrust/src/client.rs b/rclrust/src/client.rs
index 058d3d2d..fdcad5e2 100644
--- a/rclrust/src/client.rs
+++ b/rclrust/src/client.rs
@@ -1,23 +1,27 @@
-use std::collections::HashMap;
-use std::ffi::CString;
-use std::marker::PhantomData;
-use std::mem::MaybeUninit;
-use std::os::raw::c_void;
-use std::sync::{Arc, Mutex, Weak};
-use std::time::Duration;
+use std::{
+    collections::HashMap,
+    ffi::CString,
+    marker::PhantomData,
+    mem::MaybeUninit,
+    os::raw::c_void,
+    sync::{Arc, Mutex, Weak},
+    time::Duration,
+};
 
 use anyhow::{anyhow, Context as _, Result};
 use futures::channel::oneshot;
 use rclrust_msg::_core::{FFIToRust, MessageT, ServiceT};
 
-use crate::context::Context;
-use crate::error::{RclRustError, ToRclRustResult};
-use crate::internal::ffi::*;
-use crate::log::Logger;
-use crate::node::{Node, RclNode};
-use crate::qos::QoSProfile;
-use crate::rclrust_error;
-use crate::wait_set::RclWaitSet;
+use crate::{
+    context::Context,
+    error::{RclRustError, ToRclRustResult},
+    internal::ffi::*,
+    log::Logger,
+    node::{Node, RclNode},
+    qos::QoSProfile,
+    rclrust_error,
+    wait_set::RclWaitSet,
+};
 
 #[derive(Debug)]
 pub(crate) struct RclClient(Box<rcl_sys::rcl_client_t>);
diff --git a/rclrust/src/clock.rs b/rclrust/src/clock.rs
index 7a984242..d8ec6944 100644
--- a/rclrust/src/clock.rs
+++ b/rclrust/src/clock.rs
@@ -2,11 +2,9 @@ use std::mem::MaybeUninit;
 
 use anyhow::{ensure, Context, Result};
 
-use crate::error::ToRclRustResult;
-use crate::impl_from_trait_for_enum;
-use crate::log::Logger;
-use crate::rclrust_error;
-use crate::time::Time;
+use crate::{
+    error::ToRclRustResult, impl_from_trait_for_enum, log::Logger, rclrust_error, time::Time,
+};
 
 /// Time source type, used to indicate the source of a time measurement.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
diff --git a/rclrust/src/context.rs b/rclrust/src/context.rs
index 0106f72f..e4ab52f4 100644
--- a/rclrust/src/context.rs
+++ b/rclrust/src/context.rs
@@ -1,16 +1,19 @@
-use std::ffi::CString;
-use std::os::raw::c_int;
-use std::sync::{Arc, Mutex};
+use std::{
+    ffi::CString,
+    os::raw::c_int,
+    sync::{Arc, Mutex},
+};
 
 use anyhow::{Context as _, Result};
 
-use crate::error::ToRclRustResult;
-use crate::init_options::InitOptions;
-use crate::log::Logger;
-use crate::log::{logging_output_handler, LOGGER_MUTEX};
-use crate::node::Node;
-use crate::node_options::NodeOptions;
-use crate::rclrust_error;
+use crate::{
+    error::ToRclRustResult,
+    init_options::InitOptions,
+    log::{logging_output_handler, Logger, LOGGER_MUTEX},
+    node::Node,
+    node_options::NodeOptions,
+    rclrust_error,
+};
 
 #[derive(Debug)]
 pub(crate) struct RclContext(Box<rcl_sys::rcl_context_t>);
diff --git a/rclrust/src/executor.rs b/rclrust/src/executor.rs
index 9f72fa43..be9a879d 100644
--- a/rclrust/src/executor.rs
+++ b/rclrust/src/executor.rs
@@ -1,12 +1,11 @@
-use std::sync::{Arc, Weak};
-use std::time::Duration;
+use std::{
+    sync::{Arc, Weak},
+    time::Duration,
+};
 
 use anyhow::Result;
 
-use crate::context::Context;
-use crate::error::RclRustError;
-use crate::node::Node;
-use crate::wait_set::RclWaitSet;
+use crate::{context::Context, error::RclRustError, node::Node, wait_set::RclWaitSet};
 
 pub fn spin(node: &Arc<Node<'_>>) -> Result<()> {
     let mut exec = SingleThreadExecutor::new(node.context)?;
diff --git a/rclrust/src/init_options.rs b/rclrust/src/init_options.rs
index 4e77c639..ffc682ac 100644
--- a/rclrust/src/init_options.rs
+++ b/rclrust/src/init_options.rs
@@ -1,8 +1,6 @@
 use anyhow::{Context, Result};
 
-use crate::error::ToRclRustResult;
-use crate::log::Logger;
-use crate::rclrust_error;
+use crate::{error::ToRclRustResult, log::Logger, rclrust_error};
 
 #[derive(Debug)]
 pub(crate) struct RclInitOptions(rcl_sys::rcl_init_options_t);
diff --git a/rclrust/src/internal/ffi.rs b/rclrust/src/internal/ffi.rs
index d2acedbc..7b683dcb 100644
--- a/rclrust/src/internal/ffi.rs
+++ b/rclrust/src/internal/ffi.rs
@@ -1,5 +1,7 @@
-use std::ffi::{CStr, CString};
-use std::os::raw::c_char;
+use std::{
+    ffi::{CStr, CString},
+    os::raw::c_char,
+};
 
 pub unsafe trait SizedFromCChar: Sized {
     unsafe fn from_c_char(ptr: *const c_char) -> Option<Self>;
diff --git a/rclrust/src/log.rs b/rclrust/src/log.rs
index 5e2417a3..b1b7c693 100644
--- a/rclrust/src/log.rs
+++ b/rclrust/src/log.rs
@@ -1,13 +1,17 @@
-use std::convert::{TryFrom, TryInto};
-use std::ffi::CString;
-use std::os::raw::{c_char, c_int};
+use std::{
+    convert::{TryFrom, TryInto},
+    ffi::CString,
+    os::raw::{c_char, c_int},
+};
 
 use anyhow::{Context, Result};
 use once_cell::sync::Lazy;
 use parking_lot::ReentrantMutex;
 
-use crate::error::{RclRustError, ToRclRustResult};
-use crate::impl_from_trait_for_enum;
+use crate::{
+    error::{RclRustError, ToRclRustResult},
+    impl_from_trait_for_enum,
+};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum LogSeverity {
diff --git a/rclrust/src/node.rs b/rclrust/src/node.rs
index bad1272d..e39c9512 100644
--- a/rclrust/src/node.rs
+++ b/rclrust/src/node.rs
@@ -1,26 +1,32 @@
-use std::ffi::CString;
-use std::sync::{Arc, Mutex, Weak};
-use std::time::Duration;
+use std::{
+    ffi::CString,
+    sync::{Arc, Mutex, Weak},
+    time::Duration,
+};
 
 use anyhow::{ensure, Context as _, Result};
-use rclrust_msg::_core::{FFIToRust, MessageT, ServiceT};
-use rclrust_msg::rcl_interfaces::msg::ParameterDescriptor;
-
-use crate::client::{Client, ClientBase};
-use crate::clock::ClockType;
-use crate::context::{Context, RclContext};
-use crate::error::ToRclRustResult;
-use crate::internal::ffi::*;
-use crate::log::Logger;
-use crate::node_options::NodeOptions;
-use crate::parameter::{Parameter, ParameterValue, Parameters};
-use crate::publisher::Publisher;
-use crate::qos::QoSProfile;
-use crate::rclrust_error;
-use crate::service::{Service, ServiceBase};
-use crate::subscription::{Subscription, SubscriptionBase};
-use crate::timer::Timer;
-use crate::wait_set::RclWaitSet;
+use rclrust_msg::{
+    _core::{FFIToRust, MessageT, ServiceT},
+    rcl_interfaces::msg::ParameterDescriptor,
+};
+
+use crate::{
+    client::{Client, ClientBase},
+    clock::ClockType,
+    context::{Context, RclContext},
+    error::ToRclRustResult,
+    internal::ffi::*,
+    log::Logger,
+    node_options::NodeOptions,
+    parameter::{Parameter, ParameterValue, Parameters},
+    publisher::Publisher,
+    qos::QoSProfile,
+    rclrust_error,
+    service::{Service, ServiceBase},
+    subscription::{Subscription, SubscriptionBase},
+    timer::Timer,
+    wait_set::RclWaitSet,
+};
 
 #[derive(Debug)]
 pub(crate) struct RclNode(Box<rcl_sys::rcl_node_t>);
diff --git a/rclrust/src/node_options.rs b/rclrust/src/node_options.rs
index d4fc8000..039bbc9f 100644
--- a/rclrust/src/node_options.rs
+++ b/rclrust/src/node_options.rs
@@ -1,6 +1,4 @@
-use crate::error::ToRclRustResult;
-use crate::log::Logger;
-use crate::rclrust_error;
+use crate::{error::ToRclRustResult, log::Logger, rclrust_error};
 
 #[derive(Debug)]
 pub(crate) struct RclNodeOptions(rcl_sys::rcl_node_options_t);
diff --git a/rclrust/src/parameter/parameters.rs b/rclrust/src/parameter/parameters.rs
index e7cef1c6..c126d20d 100644
--- a/rclrust/src/parameter/parameters.rs
+++ b/rclrust/src/parameter/parameters.rs
@@ -1,14 +1,11 @@
-use std::collections::HashMap;
-use std::sync::Mutex;
+use std::{collections::HashMap, sync::Mutex};
 
 use anyhow::Result;
 
 use super::{
     Parameter, ParameterDescriptor, ParameterType, ParameterValue, RclParams, SetParametersResult,
 };
-use crate::context::RclContext;
-use crate::error::RclRustError;
-use crate::node::RclNode;
+use crate::{context::RclContext, error::RclRustError, node::RclNode};
 
 #[derive(Debug, Default, Clone)]
 pub struct ParameterInfo {
diff --git a/rclrust/src/parameter/rcl_params.rs b/rclrust/src/parameter/rcl_params.rs
index 2c7f0fd6..841cb32b 100644
--- a/rclrust/src/parameter/rcl_params.rs
+++ b/rclrust/src/parameter/rcl_params.rs
@@ -3,8 +3,10 @@ use std::collections::HashMap;
 use anyhow::{Context, Result};
 
 use super::ParameterValue;
-use crate::error::{RclRustError, ToRclRustResult};
-use crate::internal::ffi::{FromCChar, SizedFromCChar};
+use crate::{
+    error::{RclRustError, ToRclRustResult},
+    internal::ffi::{FromCChar, SizedFromCChar},
+};
 
 #[derive(Debug)]
 pub struct RclParams(Box<*mut rcl_sys::rcl_params_t>);
diff --git a/rclrust/src/publisher.rs b/rclrust/src/publisher.rs
index 22952fc2..ec809920 100644
--- a/rclrust/src/publisher.rs
+++ b/rclrust/src/publisher.rs
@@ -1,17 +1,21 @@
-use std::ffi::CString;
-use std::marker::PhantomData;
-use std::os::raw::c_void;
-use std::sync::{Arc, Mutex};
+use std::{
+    ffi::CString,
+    marker::PhantomData,
+    os::raw::c_void,
+    sync::{Arc, Mutex},
+};
 
 use anyhow::{Context, Result};
 use rclrust_msg::_core::MessageT;
 
-use crate::error::ToRclRustResult;
-use crate::internal::ffi::*;
-use crate::log::Logger;
-use crate::node::{Node, RclNode};
-use crate::qos::QoSProfile;
-use crate::rclrust_error;
+use crate::{
+    error::ToRclRustResult,
+    internal::ffi::*,
+    log::Logger,
+    node::{Node, RclNode},
+    qos::QoSProfile,
+    rclrust_error,
+};
 
 #[derive(Debug)]
 pub(crate) struct RclPublisher(Box<rcl_sys::rcl_publisher_t>);
diff --git a/rclrust/src/qos.rs b/rclrust/src/qos.rs
index 35b70f8c..e79c62cf 100644
--- a/rclrust/src/qos.rs
+++ b/rclrust/src/qos.rs
@@ -1,7 +1,6 @@
 use std::time::Duration;
 
-use crate::impl_from_trait_for_enum;
-use crate::time::RclDurationT;
+use crate::{impl_from_trait_for_enum, time::RclDurationT};
 
 /// QoS reliability enumerations
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
diff --git a/rclrust/src/service.rs b/rclrust/src/service.rs
index 3e08be94..fbf93d01 100644
--- a/rclrust/src/service.rs
+++ b/rclrust/src/service.rs
@@ -1,16 +1,20 @@
-use std::ffi::{c_void, CString};
-use std::mem::MaybeUninit;
-use std::sync::{Arc, Mutex};
+use std::{
+    ffi::{c_void, CString},
+    mem::MaybeUninit,
+    sync::{Arc, Mutex},
+};
 
 use anyhow::{Context, Result};
 use rclrust_msg::_core::{MessageT, ServiceT};
 
-use crate::error::{RclRustError, ToRclRustResult};
-use crate::internal::ffi::*;
-use crate::log::Logger;
-use crate::node::{Node, RclNode};
-use crate::qos::QoSProfile;
-use crate::rclrust_error;
+use crate::{
+    error::{RclRustError, ToRclRustResult},
+    internal::ffi::*,
+    log::Logger,
+    node::{Node, RclNode},
+    qos::QoSProfile,
+    rclrust_error,
+};
 
 pub struct RclService(Box<rcl_sys::rcl_service_t>);
 
diff --git a/rclrust/src/subscription.rs b/rclrust/src/subscription.rs
index c72b6ed5..b4b59dda 100644
--- a/rclrust/src/subscription.rs
+++ b/rclrust/src/subscription.rs
@@ -1,16 +1,20 @@
-use std::ffi::CString;
-use std::os::raw::c_void;
-use std::sync::{Arc, Mutex};
+use std::{
+    ffi::CString,
+    os::raw::c_void,
+    sync::{Arc, Mutex},
+};
 
 use anyhow::{Context, Result};
 use rclrust_msg::_core::MessageT;
 
-use crate::error::{RclRustError, ToRclRustResult};
-use crate::internal::ffi::*;
-use crate::log::Logger;
-use crate::node::{Node, RclNode};
-use crate::qos::QoSProfile;
-use crate::rclrust_error;
+use crate::{
+    error::{RclRustError, ToRclRustResult},
+    internal::ffi::*,
+    log::Logger,
+    node::{Node, RclNode},
+    qos::QoSProfile,
+    rclrust_error,
+};
 
 #[derive(Debug)]
 pub(crate) struct RclSubscription(Box<rcl_sys::rcl_subscription_t>);
diff --git a/rclrust/src/time.rs b/rclrust/src/time.rs
index bb161bb6..1898315c 100644
--- a/rclrust/src/time.rs
+++ b/rclrust/src/time.rs
@@ -1,5 +1,4 @@
-use std::convert::TryInto;
-use std::time::Duration;
+use std::{convert::TryInto, time::Duration};
 
 use rclrust_msg::builtin_interfaces;
 
diff --git a/rclrust/src/timer.rs b/rclrust/src/timer.rs
index 04e37da1..73364a1c 100644
--- a/rclrust/src/timer.rs
+++ b/rclrust/src/timer.rs
@@ -1,15 +1,19 @@
-use std::convert::TryInto;
-use std::sync::{Arc, Mutex};
-use std::time::Duration;
+use std::{
+    convert::TryInto,
+    sync::{Arc, Mutex},
+    time::Duration,
+};
 
 use anyhow::{Context, Result};
 
-use crate::clock::{Clock, ClockType};
-use crate::context::RclContext;
-use crate::error::ToRclRustResult;
-use crate::log::Logger;
-use crate::node::Node;
-use crate::rclrust_error;
+use crate::{
+    clock::{Clock, ClockType},
+    context::RclContext,
+    error::ToRclRustResult,
+    log::Logger,
+    node::Node,
+    rclrust_error,
+};
 
 #[derive(Debug)]
 pub struct RclTimer(Box<rcl_sys::rcl_timer_t>);
diff --git a/rclrust/src/utility.rs b/rclrust/src/utility.rs
index f5c54961..df78dd07 100644
--- a/rclrust/src/utility.rs
+++ b/rclrust/src/utility.rs
@@ -2,8 +2,7 @@ use std::sync::Arc;
 
 use anyhow::Result;
 
-use crate::context::Context;
-use crate::init_options::InitOptions;
+use crate::{context::Context, init_options::InitOptions};
 
 /// Initialize rclrust context
 ///
diff --git a/rclrust/src/wait_set.rs b/rclrust/src/wait_set.rs
index 6ccdc74c..725a3345 100644
--- a/rclrust/src/wait_set.rs
+++ b/rclrust/src/wait_set.rs
@@ -1,13 +1,9 @@
 use anyhow::{Context, Result};
 
-use crate::client::RclClient;
-use crate::context::RclContext;
-use crate::error::ToRclRustResult;
-use crate::log::Logger;
-use crate::rclrust_error;
-use crate::service::RclService;
-use crate::subscription::RclSubscription;
-use crate::timer::RclTimer;
+use crate::{
+    client::RclClient, context::RclContext, error::ToRclRustResult, log::Logger, rclrust_error,
+    service::RclService, subscription::RclSubscription, timer::RclTimer,
+};
 
 #[derive(Debug)]
 pub(crate) struct RclWaitSet(rcl_sys::rcl_wait_set_t);
diff --git a/rustfmt.toml b/rustfmt.toml
index b809d0ff..94bf1452 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,2 +1,3 @@
 format_code_in_doc_comments = true
 group_imports = "StdExternalCrate"
+imports_granularity = "Crate"