[rust][inspect][cleanup] Cleaner use declarations
TESTED=fx run-test rust-crates-tests -t fuchsia_inspect_lib_test
Change-Id: Ie972bbd516be523193bc06ab0c417c547c7b207b
diff --git a/garnet/public/rust/fuchsia-inspect/src/vmo/block.rs b/garnet/public/rust/fuchsia-inspect/src/vmo/block.rs
index 4742d58..8400c74 100644
--- a/garnet/public/rust/fuchsia-inspect/src/vmo/block.rs
+++ b/garnet/public/rust/fuchsia-inspect/src/vmo/block.rs
@@ -2,19 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-use byteorder::{ByteOrder, LittleEndian};
-use failure::{format_err, Error};
-use mapped_vmo::Mapping;
-use num_traits::{FromPrimitive, ToPrimitive};
-use std::cmp::min;
-use std::ptr;
-use std::rc::Rc;
-use std::sync::atomic::{fence, Ordering};
-
-use crate::vmo::bitfields::{BlockHeader, Payload};
-use crate::vmo::block_type::BlockType;
-use crate::vmo::constants;
-use crate::vmo::utils;
+use {
+ crate::vmo::{
+ bitfields::{BlockHeader, Payload},
+ block_type::BlockType,
+ constants, utils,
+ },
+ byteorder::{ByteOrder, LittleEndian},
+ failure::{format_err, Error},
+ mapped_vmo::Mapping,
+ num_traits::{FromPrimitive, ToPrimitive},
+ std::{
+ cmp::min,
+ ptr,
+ rc::Rc,
+ sync::atomic::{fence, Ordering},
+ },
+};
pub struct Block<T> {
index: u32,
diff --git a/garnet/public/rust/fuchsia-inspect/src/vmo/block_type.rs b/garnet/public/rust/fuchsia-inspect/src/vmo/block_type.rs
index 873c0a0..88ca555 100644
--- a/garnet/public/rust/fuchsia-inspect/src/vmo/block_type.rs
+++ b/garnet/public/rust/fuchsia-inspect/src/vmo/block_type.rs
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-use num_derive::{FromPrimitive, ToPrimitive};
-use std::fmt;
+use {
+ num_derive::{FromPrimitive, ToPrimitive},
+ std::fmt,
+};
#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd, FromPrimitive, ToPrimitive)]
pub enum BlockType {
diff --git a/garnet/public/rust/fuchsia-inspect/src/vmo/heap.rs b/garnet/public/rust/fuchsia-inspect/src/vmo/heap.rs
index 129cc51a..c89e6b9 100644
--- a/garnet/public/rust/fuchsia-inspect/src/vmo/heap.rs
+++ b/garnet/public/rust/fuchsia-inspect/src/vmo/heap.rs
@@ -2,15 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-use failure::{format_err, Error};
-use mapped_vmo::Mapping;
-use num_traits::ToPrimitive;
-use std::{cmp::min, rc::Rc};
-
-use crate::vmo::block::Block;
-use crate::vmo::block_type::BlockType;
-use crate::vmo::constants;
-use crate::vmo::utils;
+use {
+ crate::vmo::{block::Block, block_type::BlockType, constants, utils},
+ failure::{format_err, Error},
+ mapped_vmo::Mapping,
+ num_traits::ToPrimitive,
+ std::{cmp::min, rc::Rc},
+};
pub struct Heap {
mapping: Rc<Mapping>,
diff --git a/garnet/public/rust/fuchsia-inspect/src/vmo/reader.rs b/garnet/public/rust/fuchsia-inspect/src/vmo/reader.rs
index 4c680e3..ad5a74f 100644
--- a/garnet/public/rust/fuchsia-inspect/src/vmo/reader.rs
+++ b/garnet/public/rust/fuchsia-inspect/src/vmo/reader.rs
@@ -4,8 +4,7 @@
#![cfg(test)]
-use crate::vmo::block::Block;
-use crate::vmo::utils;
+use crate::vmo::{block::Block, utils};
/// Iterates over a byte array containing Inspect API blocks and returns the
/// blocks in order.
diff --git a/garnet/public/rust/fuchsia-inspect/src/vmo/state.rs b/garnet/public/rust/fuchsia-inspect/src/vmo/state.rs
index 02bcb55..d9b9cc8 100644
--- a/garnet/public/rust/fuchsia-inspect/src/vmo/state.rs
+++ b/garnet/public/rust/fuchsia-inspect/src/vmo/state.rs
@@ -2,17 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-use failure::{format_err, Error};
-use mapped_vmo::Mapping;
-use num_derive::{FromPrimitive, ToPrimitive};
-use num_traits::ToPrimitive;
-use std::rc::Rc;
-
-use crate::vmo::block::Block;
-use crate::vmo::block_type::BlockType;
-use crate::vmo::constants;
-use crate::vmo::heap::Heap;
-use crate::vmo::utils;
+use {
+ crate::vmo::{block::Block, block_type::BlockType, constants, heap::Heap, utils},
+ failure::{format_err, Error},
+ mapped_vmo::Mapping,
+ num_derive::{FromPrimitive, ToPrimitive},
+ num_traits::ToPrimitive,
+ std::rc::Rc,
+};
/// Wraps a heap and implements the Inspect VMO API on top of it at a low level.
pub struct State {
diff --git a/garnet/public/rust/fuchsia-inspect/src/vmo/utils.rs b/garnet/public/rust/fuchsia-inspect/src/vmo/utils.rs
index 890da6a..d0e25a3 100644
--- a/garnet/public/rust/fuchsia-inspect/src/vmo/utils.rs
+++ b/garnet/public/rust/fuchsia-inspect/src/vmo/utils.rs
@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-use crate::vmo::constants;
-use num_traits::ToPrimitive;
-use std::cmp::{max, min};
+use {
+ crate::vmo::constants,
+ num_traits::ToPrimitive,
+ std::cmp::{max, min},
+};
/// Returns the smallest order such that (MIN_ORDER_SHIFT << order) >= size.
/// Size must be non zero.
