Remove unneeded extern crate, macro_use, and tidy uses.

crates/debug/src/transform/attr.rs

@@ -1,18 +1,14 @@
-use crate::HashMap;
-use alloc::vec::Vec;
-use failure::Error;
-
-use gimli;
-
-use gimli::{AttributeValue, DebugLineOffset, DebugStr, DebuggingInformationEntry, UnitOffset};
-
-use gimli::write;
-
 use super::address_transform::AddressTransform;
 use super::expression::{compile_expression, CompiledExpression, FunctionFrameInfo};
 use super::range_info_builder::RangeInfoBuilder;
 use super::unit::PendingDieRef;
 use super::{DebugInputContext, Reader, TransformError};
+use crate::HashMap;
+use alloc::vec::Vec;
+use failure::Error;
+use gimli::{
+    write, AttributeValue, DebugLineOffset, DebugStr, DebuggingInformationEntry, UnitOffset,
+};
 
 pub(crate) enum FileAttributeContext<'a> {
     Root(Option<DebugLineOffset>),

crates/debug/src/transform/expression.rs

@@ -7,8 +7,7 @@ use cranelift_codegen::ValueLabelsRanges;
 use cranelift_entity::EntityRef;
 use cranelift_wasm::{get_vmctx_value_label, DefinedFuncIndex};
 use failure::Error;
-use gimli::write;
-use gimli::{self, Expression, Operation, Reader, ReaderOffset, Register, X86_64};
+use gimli::{self, write, Expression, Operation, Reader, ReaderOffset, Register, X86_64};
 use more_asserts::{assert_le, assert_lt};
 
 #[derive(Debug)]

crates/debug/src/transform/line_program.rs

@@ -6,9 +6,9 @@ use alloc::vec::Vec;
 use core::iter::FromIterator;
 use cranelift_entity::EntityRef;
 use failure::Error;
-use gimli;
-use gimli::write;
-use gimli::{DebugLine, DebugLineOffset, DebugStr, DebuggingInformationEntry, LineEncoding, Unit};
+use gimli::{
+    write, DebugLine, DebugLineOffset, DebugStr, DebuggingInformationEntry, LineEncoding, Unit,
+};
 use more_asserts::assert_le;
 
 #[derive(Debug)]

crates/debug/src/transform/mod.rs

@@ -1,24 +1,18 @@
 use crate::gc::build_dependencies;
-use crate::DebugInfoData;
-use crate::HashSet;
+use crate::{DebugInfoData, HashSet};
 use cranelift_codegen::isa::TargetFrontendConfig;
 use failure::Error;
+use gimli::{
+    write, DebugAddr, DebugAddrBase, DebugLine, DebugStr, LocationLists, RangeLists,
+    UnitSectionOffset,
+};
 use simulate::generate_simulated_dwarf;
 use thiserror::Error;
+use unit::clone_unit;
 use wasmtime_environ::{ModuleAddressMap, ModuleVmctxInfo, ValueLabelsRanges};
 
-use gimli;
-
-use gimli::{
-    DebugAddr, DebugAddrBase, DebugLine, DebugStr, LocationLists, RangeLists, UnitSectionOffset,
-};
-
-use gimli::write;
-
 pub use address_transform::AddressTransform;
 
-use unit::clone_unit;
-
 mod address_transform;
 mod attr;
 mod expression;

crates/debug/src/transform/range_info_builder.rs

@@ -1,13 +1,10 @@
 use super::address_transform::AddressTransform;
-use super::DebugInputContext;
-use super::Reader;
+use super::{DebugInputContext, Reader};
 use alloc::vec::Vec;
 use cranelift_entity::EntityRef;
 use cranelift_wasm::DefinedFuncIndex;
 use failure::Error;
-use gimli;
-use gimli::write;
-use gimli::{AttributeValue, DebuggingInformationEntry, RangeListsOffset};
+use gimli::{write, AttributeValue, DebuggingInformationEntry, RangeListsOffset};
 use more_asserts::assert_lt;
 
 pub(crate) enum RangeInfoBuilder {

crates/debug/src/transform/simulate.rs

@@ -1,20 +1,19 @@
+use super::expression::{CompiledExpression, FunctionFrameInfo};
+use super::utils::{add_internal_types, append_vmctx_info, get_function_frame_info};
+use super::AddressTransform;
 use crate::read_debuginfo::WasmFileInfo;
-pub use crate::read_debuginfo::{DebugInfoData, FunctionMetadata, WasmType};
 use crate::{HashMap, HashSet};
 use alloc::string::String;
 use alloc::vec::Vec;
 use cranelift_entity::EntityRef;
 use cranelift_wasm::get_vmctx_value_label;
 use failure::Error;
+use gimli::write;
+use gimli::{self, LineEncoding};
 use std::path::PathBuf;
 use wasmtime_environ::{ModuleVmctxInfo, ValueLabelsRanges};
 
-use gimli::write;
-use gimli::{self, LineEncoding};
-
-use super::expression::{CompiledExpression, FunctionFrameInfo};
-use super::utils::{add_internal_types, append_vmctx_info, get_function_frame_info};
-use super::AddressTransform;
+pub use crate::read_debuginfo::{DebugInfoData, FunctionMetadata, WasmType};
 
 const PRODUCER_NAME: &str = "wasmtime";
 

crates/debug/src/transform/unit.rs

@@ -1,16 +1,3 @@
-use crate::{HashMap, HashSet};
-use alloc::string::String;
-use alloc::vec::Vec;
-use cranelift_entity::EntityRef;
-use failure::Error;
-use wasmtime_environ::{ModuleVmctxInfo, ValueLabelsRanges};
-
-use gimli;
-
-use gimli::{AttributeValue, DebuggingInformationEntry, Unit, UnitOffset};
-
-use gimli::write;
-
 use super::address_transform::AddressTransform;
 use super::attr::{clone_die_attributes, FileAttributeContext};
 use super::expression::compile_expression;
@@ -18,6 +5,13 @@ use super::line_program::clone_line_program;
 use super::range_info_builder::RangeInfoBuilder;
 use super::utils::{add_internal_types, append_vmctx_info, get_function_frame_info};
 use super::{DebugInputContext, Reader, TransformError};
+use crate::{HashMap, HashSet};
+use alloc::{string::String, vec::Vec};
+use cranelift_entity::EntityRef;
+use failure::Error;
+use gimli::write;
+use gimli::{AttributeValue, DebuggingInformationEntry, Unit, UnitOffset};
+use wasmtime_environ::{ModuleVmctxInfo, ValueLabelsRanges};
 
 pub(crate) type PendingDieRef = (write::UnitEntryId, gimli::DwAt, UnitOffset);
 

crates/debug/src/transform/utils.rs

@@ -1,13 +1,10 @@
+use super::address_transform::AddressTransform;
+use super::expression::{CompiledExpression, FunctionFrameInfo};
 use alloc::vec::Vec;
 use cranelift_wasm::DefinedFuncIndex;
 use failure::Error;
-use wasmtime_environ::{ModuleVmctxInfo, ValueLabelsRanges};
-
-use gimli;
 use gimli::write;
-
-use super::address_transform::AddressTransform;
-use super::expression::{CompiledExpression, FunctionFrameInfo};
+use wasmtime_environ::{ModuleVmctxInfo, ValueLabelsRanges};
 
 pub(crate) fn add_internal_types(
     comp_unit: &mut write::Unit,