Run `cargo fix --edition`

30 files changed, 142 insertions, 142 deletions

diff --git a/src/callbacks.rs b/src/callbacks.rs
index 21478e4f..1b5445e6 100644
--- a/src/callbacks.rs
+++ b/src/callbacks.rs
@@ -1,7 +1,7 @@
 //! A public API for more fine-grained customization of bindgen behavior.
 
-pub use ir::enum_ty::{EnumVariantCustomBehavior, EnumVariantValue};
-pub use ir::int::IntKind;
+pub use crate::ir::enum_ty::{EnumVariantCustomBehavior, EnumVariantValue};
+pub use crate::ir::int::IntKind;
 use std::fmt;
 use std::panic::UnwindSafe;
 
diff --git a/src/clang.rs b/src/clang.rs
index 4bcc4b4a..cae3207e 100644
--- a/src/clang.rs
+++ b/src/clang.rs
@@ -6,7 +6,7 @@
 
 use cexpr;
 use clang_sys::*;
-use ir::context::BindgenContext;
+use crate::ir::context::BindgenContext;
 use regex;
 use std::ffi::{CStr, CString};
 use std::fmt;
@@ -1085,8 +1085,8 @@ impl Type {
     pub fn fallible_layout(
         &self,
         ctx: &BindgenContext,
-    ) -> Result<::ir::layout::Layout, LayoutError> {
-        use ir::layout::Layout;
+    ) -> Result<crate::ir::layout::Layout, LayoutError> {
+        use crate::ir::layout::Layout;
         let size = self.fallible_size(ctx)?;
         let align = self.fallible_align(ctx)?;
         Ok(Layout::new(size, align))
diff --git a/src/codegen/helpers.rs b/src/codegen/helpers.rs
index ec60742c..b6825f5e 100644
--- a/src/codegen/helpers.rs
+++ b/src/codegen/helpers.rs
@@ -1,7 +1,7 @@
 //! Helpers for code generation that don't need macro expansion.
 
-use ir::context::BindgenContext;
-use ir::layout::Layout;
+use crate::ir::context::BindgenContext;
+use crate::ir::layout::Layout;
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::TokenStreamExt;
 
@@ -136,10 +136,10 @@ pub fn bitfield_unit(ctx: &BindgenContext, layout: Layout) -> TokenStream {
 }
 
 pub mod ast_ty {
-    use ir::context::BindgenContext;
-    use ir::function::FunctionSig;
-    use ir::layout::Layout;
-    use ir::ty::FloatKind;
+    use crate::ir::context::BindgenContext;
+    use crate::ir::function::FunctionSig;
+    use crate::ir::layout::Layout;
+    use crate::ir::ty::FloatKind;
     use proc_macro2::{self, TokenStream};
     use std::str::FromStr;
 
diff --git a/src/codegen/impl_debug.rs b/src/codegen/impl_debug.rs
index eac54fd1..ed1a5e25 100644
--- a/src/codegen/impl_debug.rs
+++ b/src/codegen/impl_debug.rs
@@ -1,7 +1,7 @@
-use ir::comp::{BitfieldUnit, CompKind, Field, FieldData, FieldMethods};
-use ir::context::BindgenContext;
-use ir::item::{HasTypeParamInArray, IsOpaque, Item, ItemCanonicalName};
-use ir::ty::{TypeKind, RUST_DERIVE_IN_ARRAY_LIMIT};
+use crate::ir::comp::{BitfieldUnit, CompKind, Field, FieldData, FieldMethods};
+use crate::ir::context::BindgenContext;
+use crate::ir::item::{HasTypeParamInArray, IsOpaque, Item, ItemCanonicalName};
+use crate::ir::ty::{TypeKind, RUST_DERIVE_IN_ARRAY_LIMIT};
 use proc_macro2;
 
 pub fn gen_debug_impl(
diff --git a/src/codegen/impl_partialeq.rs b/src/codegen/impl_partialeq.rs
index d73f36bb..5f2600e2 100644
--- a/src/codegen/impl_partialeq.rs
+++ b/src/codegen/impl_partialeq.rs
@@ -1,7 +1,7 @@
-use ir::comp::{CompInfo, CompKind, Field, FieldMethods};
-use ir::context::BindgenContext;
-use ir::item::{IsOpaque, Item};
-use ir::ty::{TypeKind, RUST_DERIVE_IN_ARRAY_LIMIT};
+use crate::ir::comp::{CompInfo, CompKind, Field, FieldMethods};
+use crate::ir::context::BindgenContext;
+use crate::ir::item::{IsOpaque, Item};
+use crate::ir::ty::{TypeKind, RUST_DERIVE_IN_ARRAY_LIMIT};
 use proc_macro2;
 
 /// Generate a manual implementation of `PartialEq` trait for the
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 73cc2f25..cba9d66b 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -15,32 +15,32 @@ use self::struct_layout::StructLayoutTracker;
 
 use super::BindgenOptions;
 
-use ir::analysis::{HasVtable, Sizedness};
-use ir::annotations::FieldAccessorKind;
-use ir::comment;
-use ir::comp::{
+use crate::ir::analysis::{HasVtable, Sizedness};
+use crate::ir::annotations::FieldAccessorKind;
+use crate::ir::comment;
+use crate::ir::comp::{
     Base, Bitfield, BitfieldUnit, CompInfo, CompKind, Field, FieldData,
     FieldMethods, Method, MethodKind,
 };
-use ir::context::{BindgenContext, ItemId};
-use ir::derive::{
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::derive::{
     CanDerive, CanDeriveCopy, CanDeriveDebug, CanDeriveDefault, CanDeriveEq,
     CanDeriveHash, CanDeriveOrd, CanDerivePartialEq, CanDerivePartialOrd,
 };
-use ir::dot;
-use ir::enum_ty::{Enum, EnumVariant, EnumVariantValue};
-use ir::function::{Abi, Function, FunctionKind, FunctionSig, Linkage};
-use ir::int::IntKind;
-use ir::item::{IsOpaque, Item, ItemCanonicalName, ItemCanonicalPath};
-use ir::item_kind::ItemKind;
-use ir::layout::Layout;
-use ir::module::Module;
-use ir::objc::{ObjCInterface, ObjCMethod};
-use ir::template::{
+use crate::ir::dot;
+use crate::ir::enum_ty::{Enum, EnumVariant, EnumVariantValue};
+use crate::ir::function::{Abi, Function, FunctionKind, FunctionSig, Linkage};
+use crate::ir::int::IntKind;
+use crate::ir::item::{IsOpaque, Item, ItemCanonicalName, ItemCanonicalPath};
+use crate::ir::item_kind::ItemKind;
+use crate::ir::layout::Layout;
+use crate::ir::module::Module;
+use crate::ir::objc::{ObjCInterface, ObjCMethod};
+use crate::ir::template::{
     AsTemplateParam, TemplateInstantiation, TemplateParameters,
 };
-use ir::ty::{Type, TypeKind};
-use ir::var::Var;
+use crate::ir::ty::{Type, TypeKind};
+use crate::ir::var::Var;
 
 use proc_macro2::{self, Ident, Span};
 use quote::TokenStreamExt;
@@ -53,7 +53,7 @@ use std::fmt::Write;
 use std::iter;
 use std::ops;
 use std::str::FromStr;
-use {Entry, HashMap, HashSet};
+use crate::{Entry, HashMap, HashSet};
 
 // Name of type defined in constified enum module
 pub static CONSTIFIED_ENUM_MODULE_REPR_NAME: &'static str = "Type";
@@ -483,7 +483,7 @@ impl CodeGenerator for Var {
         result: &mut CodegenResult<'a>,
         item: &Item,
     ) {
-        use ir::var::VarType;
+        use crate::ir::var::VarType;
         debug!("<Var as CodeGenerator>::codegen: item = {:?}", item);
         debug_assert!(item.is_enabled_for_codegen(ctx));
 
@@ -1310,7 +1310,7 @@ impl<'a> FieldCodegen<'a> for BitfieldUnit {
         F: Extend<proc_macro2::TokenStream>,
         M: Extend<proc_macro2::TokenStream>,
     {
-        use ir::ty::RUST_DERIVE_IN_ARRAY_LIMIT;
+        use crate::ir::ty::RUST_DERIVE_IN_ARRAY_LIMIT;
 
         result.saw_bitfield_unit();
 
@@ -3855,10 +3855,10 @@ pub(crate) fn codegen(
 
 mod utils {
     use super::{error, ToRustTyOrOpaque};
-    use ir::context::BindgenContext;
-    use ir::function::{Abi, FunctionSig};
-    use ir::item::{Item, ItemCanonicalPath};
-    use ir::ty::TypeKind;
+    use crate::ir::context::BindgenContext;
+    use crate::ir::function::{Abi, FunctionSig};
+    use crate::ir::item::{Item, ItemCanonicalPath};
+    use crate::ir::ty::TypeKind;
     use proc_macro2;
     use std::borrow::Cow;
     use std::mem;
diff --git a/src/codegen/struct_layout.rs b/src/codegen/struct_layout.rs
index 6e3f57b2..900f2586 100644
--- a/src/codegen/struct_layout.rs
+++ b/src/codegen/struct_layout.rs
@@ -2,10 +2,10 @@
 
 use super::helpers;
 
-use ir::comp::CompInfo;
-use ir::context::BindgenContext;
-use ir::layout::Layout;
-use ir::ty::{Type, TypeKind};
+use crate::ir::comp::CompInfo;
+use crate::ir::context::BindgenContext;
+use crate::ir::layout::Layout;
+use crate::ir::ty::{Type, TypeKind};
 use proc_macro2::{self, Ident, Span};
 use std::cmp;
 
diff --git a/src/ir/analysis/derive.rs b/src/ir/analysis/derive.rs
index f9cc404c..6858d7f1 100644
--- a/src/ir/analysis/derive.rs
+++ b/src/ir/analysis/derive.rs
@@ -3,17 +3,17 @@
 use std::fmt;
 
 use super::{generate_dependencies, ConstrainResult, MonotoneFramework};
-use ir::analysis::has_vtable::HasVtable;
-use ir::comp::CompKind;
-use ir::context::{BindgenContext, ItemId};
-use ir::derive::CanDerive;
-use ir::function::FunctionSig;
-use ir::item::{IsOpaque, Item};
-use ir::template::TemplateParameters;
-use ir::traversal::{EdgeKind, Trace};
-use ir::ty::RUST_DERIVE_IN_ARRAY_LIMIT;
-use ir::ty::{Type, TypeKind};
-use {Entry, HashMap, HashSet};
+use crate::ir::analysis::has_vtable::HasVtable;
+use crate::ir::comp::CompKind;
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::derive::CanDerive;
+use crate::ir::function::FunctionSig;
+use crate::ir::item::{IsOpaque, Item};
+use crate::ir::template::TemplateParameters;
+use crate::ir::traversal::{EdgeKind, Trace};
+use crate::ir::ty::RUST_DERIVE_IN_ARRAY_LIMIT;
+use crate::ir::ty::{Type, TypeKind};
+use crate::{Entry, HashMap, HashSet};
 
 /// Which trait to consider when doing the `CannotDerive` analysis.
 #[derive(Debug, Copy, Clone)]
diff --git a/src/ir/analysis/has_destructor.rs b/src/ir/analysis/has_destructor.rs
index 12b69260..ca4f2532 100644
--- a/src/ir/analysis/has_destructor.rs
+++ b/src/ir/analysis/has_destructor.rs
@@ -1,11 +1,11 @@
 //! Determining which types have destructors
 
 use super::{generate_dependencies, ConstrainResult, MonotoneFramework};
-use ir::comp::{CompKind, Field, FieldMethods};
-use ir::context::{BindgenContext, ItemId};
-use ir::traversal::EdgeKind;
-use ir::ty::TypeKind;
-use {HashMap, HashSet};
+use crate::ir::comp::{CompKind, Field, FieldMethods};
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::traversal::EdgeKind;
+use crate::ir::ty::TypeKind;
+use crate::{HashMap, HashSet};
 
 /// An analysis that finds for each IR item whether it has a destructor or not
 ///
diff --git a/src/ir/analysis/has_float.rs b/src/ir/analysis/has_float.rs
index 7c62a9e2..d21e651d 100644
--- a/src/ir/analysis/has_float.rs
+++ b/src/ir/analysis/has_float.rs
@@ -1,12 +1,12 @@
 //! Determining which types has float.
 
 use super::{generate_dependencies, ConstrainResult, MonotoneFramework};
-use ir::comp::Field;
-use ir::comp::FieldMethods;
-use ir::context::{BindgenContext, ItemId};
-use ir::traversal::EdgeKind;
-use ir::ty::TypeKind;
-use {HashMap, HashSet};
+use crate::ir::comp::Field;
+use crate::ir::comp::FieldMethods;
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::traversal::EdgeKind;
+use crate::ir::ty::TypeKind;
+use crate::{HashMap, HashSet};
 
 /// An analysis that finds for each IR item whether it has float or not.
 ///
diff --git a/src/ir/analysis/has_type_param_in_array.rs b/src/ir/analysis/has_type_param_in_array.rs
index 4217f6f0..ebdb7e34 100644
--- a/src/ir/analysis/has_type_param_in_array.rs
+++ b/src/ir/analysis/has_type_param_in_array.rs
@@ -1,12 +1,12 @@
 //! Determining which types has typed parameters in array.
 
 use super::{generate_dependencies, ConstrainResult, MonotoneFramework};
-use ir::comp::Field;
-use ir::comp::FieldMethods;
-use ir::context::{BindgenContext, ItemId};
-use ir::traversal::EdgeKind;
-use ir::ty::TypeKind;
-use {HashMap, HashSet};
+use crate::ir::comp::Field;
+use crate::ir::comp::FieldMethods;
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::traversal::EdgeKind;
+use crate::ir::ty::TypeKind;
+use crate::{HashMap, HashSet};
 
 /// An analysis that finds for each IR item whether it has array or not.
 ///
diff --git a/src/ir/analysis/has_vtable.rs b/src/ir/analysis/has_vtable.rs
index 026eedd0..9e0f9041 100644
--- a/src/ir/analysis/has_vtable.rs
+++ b/src/ir/analysis/has_vtable.rs
@@ -1,12 +1,12 @@
 //! Determining which types has vtable
 
 use super::{generate_dependencies, ConstrainResult, MonotoneFramework};
-use ir::context::{BindgenContext, ItemId};
-use ir::traversal::EdgeKind;
-use ir::ty::TypeKind;
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::traversal::EdgeKind;
+use crate::ir::ty::TypeKind;
 use std::cmp;
 use std::ops;
-use {Entry, HashMap};
+use crate::{Entry, HashMap};
 
 /// The result of the `HasVtableAnalysis` for an individual item.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
diff --git a/src/ir/analysis/mod.rs b/src/ir/analysis/mod.rs
index a3ba9848..4cfc9cb1 100644
--- a/src/ir/analysis/mod.rs
+++ b/src/ir/analysis/mod.rs
@@ -53,12 +53,12 @@ pub use self::has_float::HasFloat;
 mod sizedness;
 pub use self::sizedness::{Sizedness, SizednessAnalysis, SizednessResult};
 
-use ir::context::{BindgenContext, ItemId};
+use crate::ir::context::{BindgenContext, ItemId};
 
-use ir::traversal::{EdgeKind, Trace};
+use crate::ir::traversal::{EdgeKind, Trace};
 use std::fmt;
 use std::ops;
-use HashMap;
+use crate::HashMap;
 
 /// An analysis in the monotone framework.
 ///
@@ -211,7 +211,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use {HashMap, HashSet};
+    use crate::{HashMap, HashSet};
 
     // Here we find the set of nodes that are reachable from any given
     // node. This is a lattice mapping nodes to subsets of all nodes. Our join
diff --git a/src/ir/analysis/sizedness.rs b/src/ir/analysis/sizedness.rs
index 1c9171bd..72a66d0d 100644
--- a/src/ir/analysis/sizedness.rs
+++ b/src/ir/analysis/sizedness.rs
@@ -3,12 +3,12 @@
 use super::{
     generate_dependencies, ConstrainResult, HasVtable, MonotoneFramework,
 };
-use ir::context::{BindgenContext, TypeId};
-use ir::item::IsOpaque;
-use ir::traversal::EdgeKind;
-use ir::ty::TypeKind;
+use crate::ir::context::{BindgenContext, TypeId};
+use crate::ir::item::IsOpaque;
+use crate::ir::traversal::EdgeKind;
+use crate::ir::ty::TypeKind;
 use std::{cmp, ops};
-use {Entry, HashMap};
+use crate::{Entry, HashMap};
 
 /// The result of the `Sizedness` analysis for an individual item.
 ///
diff --git a/src/ir/analysis/template_params.rs b/src/ir/analysis/template_params.rs
index da392162..f0d9b5e8 100644
--- a/src/ir/analysis/template_params.rs
+++ b/src/ir/analysis/template_params.rs
@@ -89,12 +89,12 @@
 //! See `src/ir/analysis.rs` for more.
 
 use super::{ConstrainResult, MonotoneFramework};
-use ir::context::{BindgenContext, ItemId};
-use ir::item::{Item, ItemSet};
-use ir::template::{TemplateInstantiation, TemplateParameters};
-use ir::traversal::{EdgeKind, Trace};
-use ir::ty::TypeKind;
-use {HashMap, HashSet};
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::item::{Item, ItemSet};
+use crate::ir::template::{TemplateInstantiation, TemplateParameters};
+use crate::ir::traversal::{EdgeKind, Trace};
+use crate::ir::ty::TypeKind;
+use crate::{HashMap, HashSet};
 
 /// An analysis that finds for each IR item its set of template parameters that
 /// it uses.
diff --git a/src/ir/annotations.rs b/src/ir/annotations.rs
index 403bffc1..98a0c042 100644
--- a/src/ir/annotations.rs
+++ b/src/ir/annotations.rs
@@ -4,7 +4,7 @@
 //! replace other types with, mark as opaque, etc. This module deals with all of
 //! that stuff.
 
-use clang;
+use crate::clang;
 
 /// What kind of accessor should we provide for a field?
 #[derive(Copy, PartialEq, Clone, Debug)]
diff --git a/src/ir/comp.rs b/src/ir/comp.rs
index a7bfbe30..dca9312b 100644
--- a/src/ir/comp.rs
+++ b/src/ir/comp.rs
@@ -9,15 +9,15 @@ use super::layout::Layout;
 use super::template::TemplateParameters;
 use super::traversal::{EdgeKind, Trace, Tracer};
 use super::ty::RUST_DERIVE_IN_ARRAY_LIMIT;
-use clang;
-use codegen::struct_layout::{align_to, bytes_from_bits_pow2};
-use ir::derive::CanDeriveCopy;
-use parse::{ClangItemParser, ParseError};
+use crate::clang;
+use crate::codegen::struct_layout::{align_to, bytes_from_bits_pow2};
+use crate::ir::derive::CanDeriveCopy;
+use crate::parse::{ClangItemParser, ParseError};
 use peeking_take_while::PeekableExt;
 use std::cmp;
 use std::io;
 use std::mem;
-use HashMap;
+use crate::HashMap;
 
 /// The kind of compound type.
 #[derive(Debug, Copy, Clone, PartialEq)]
diff --git a/src/ir/context.rs b/src/ir/context.rs
index a3601793..27eb91d3 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -19,19 +19,19 @@ use super::module::{Module, ModuleKind};
 use super::template::{TemplateInstantiation, TemplateParameters};
 use super::traversal::{self, Edge, ItemTraversal};
 use super::ty::{FloatKind, Type, TypeKind};
-use callbacks::ParseCallbacks;
+use crate::callbacks::ParseCallbacks;
 use cexpr;
-use clang::{self, Cursor};
+use crate::clang::{self, Cursor};
 use clang_sys;
-use parse::ClangItemParser;
+use crate::parse::ClangItemParser;
 use proc_macro2::{Ident, Span};
 use std::borrow::Cow;
 use std::cell::Cell;
 use std::collections::HashMap as StdHashMap;
 use std::iter::IntoIterator;
 use std::mem;
-use BindgenOptions;
-use {Entry, HashMap, HashSet};
+use crate::BindgenOptions;
+use crate::{Entry, HashMap, HashSet};
 
 /// An identifier for some kind of IR item.
 #[derive(Debug, Copy, Clone, Eq, PartialOrd, Ord, Hash)]
diff --git a/src/ir/enum_ty.rs b/src/ir/enum_ty.rs
index f2013844..89b37ae7 100644
--- a/src/ir/enum_ty.rs
+++ b/src/ir/enum_ty.rs
@@ -4,11 +4,11 @@ use super::super::codegen::EnumVariation;
 use super::context::{BindgenContext, TypeId};
 use super::item::Item;
 use super::ty::TypeKind;
-use clang;
-use ir::annotations::Annotations;
-use ir::item::ItemCanonicalPath;
-use parse::{ClangItemParser, ParseError};
-use regex_set::RegexSet;
+use crate::clang;
+use crate::ir::annotations::Annotations;
+use crate::ir::item::ItemCanonicalPath;
+use crate::parse::{ClangItemParser, ParseError};
+use crate::regex_set::RegexSet;
 
 /// An enum representing custom handling that can be given to a variant.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
diff --git a/src/ir/function.rs b/src/ir/function.rs
index 0715ec54..b22a7427 100644
--- a/src/ir/function.rs
+++ b/src/ir/function.rs
@@ -6,9 +6,9 @@ use super::dot::DotAttributes;
 use super::item::Item;
 use super::traversal::{EdgeKind, Trace, Tracer};
 use super::ty::TypeKind;
-use clang;
+use crate::clang;
 use clang_sys::{self, CXCallingConv};
-use parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
+use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
 use proc_macro2;
 use quote;
 use quote::TokenStreamExt;
diff --git a/src/ir/item.rs b/src/ir/item.rs
index eb5b4d25..f4ac6484 100644
--- a/src/ir/item.rs
+++ b/src/ir/item.rs
@@ -18,10 +18,10 @@ use super::module::Module;
 use super::template::{AsTemplateParam, TemplateParameters};
 use super::traversal::{EdgeKind, Trace, Tracer};
 use super::ty::{Type, TypeKind};
-use clang;
+use crate::clang;
 use clang_sys;
 use lazycell::LazyCell;
-use parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
+use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
 use regex;
 use std::cell::Cell;
 use std::collections::BTreeSet;
@@ -1296,7 +1296,7 @@ impl ClangItemParser for Item {
         ctx: &mut BindgenContext,
     ) -> Result<ItemId, ParseError> {
         use clang_sys::*;
-        use ir::var::Var;
+        use crate::ir::var::Var;
 
         if !cursor.is_valid() {
             return Err(ParseError::Continue);
diff --git a/src/ir/layout.rs b/src/ir/layout.rs
index 1c61b2ad..28a6604d 100644
--- a/src/ir/layout.rs
+++ b/src/ir/layout.rs
@@ -2,8 +2,8 @@
 
 use super::derive::CanDerive;
 use super::ty::{Type, TypeKind, RUST_DERIVE_IN_ARRAY_LIMIT};
-use clang;
-use ir::context::BindgenContext;
+use crate::clang;
+use crate::ir::context::BindgenContext;
 use std::cmp;
 
 /// A type that represents the struct layout of a type.
diff --git a/src/ir/module.rs b/src/ir/module.rs
index 7a221066..13b7c19f 100644
--- a/src/ir/module.rs
+++ b/src/ir/module.rs
@@ -3,9 +3,9 @@
 use super::context::BindgenContext;
 use super::dot::DotAttributes;
 use super::item::ItemSet;
-use clang;
-use parse::{ClangSubItemParser, ParseError, ParseResult};
-use parse_one;
+use crate::clang;
+use crate::parse::{ClangSubItemParser, ParseError, ParseResult};
+use crate::parse_one;
 use std::io;
 
 /// Whether this module is inline or not.
diff --git a/src/ir/objc.rs b/src/ir/objc.rs
index ba650d57..5fb645d5 100644
--- a/src/ir/objc.rs
+++ b/src/ir/objc.rs
@@ -4,7 +4,7 @@ use super::context::{BindgenContext, ItemId};
 use super::function::FunctionSig;
 use super::traversal::{Trace, Tracer};
 use super::ty::TypeKind;
-use clang;
+use crate::clang;
 use clang_sys::CXChildVisit_Continue;
 use clang_sys::CXCursor_ObjCCategoryDecl;
 use clang_sys::CXCursor_ObjCClassMethodDecl;
diff --git a/src/ir/template.rs b/src/ir/template.rs
index 30c578ce..e2900e95 100644
--- a/src/ir/template.rs
+++ b/src/ir/template.rs
@@ -30,8 +30,8 @@
 use super::context::{BindgenContext, ItemId, TypeId};
 use super::item::{IsOpaque, Item, ItemAncestors, ItemCanonicalPath};
 use super::traversal::{EdgeKind, Trace, Tracer};
-use clang;
-use parse::ClangItemParser;
+use crate::clang;
+use crate::parse::ClangItemParser;
 
 /// Template declaration (and such declaration's template parameters) related
 /// methods.
diff --git a/src/ir/ty.rs b/src/ir/ty.rs
index 0144bdba..b77b5e75 100644
--- a/src/ir/ty.rs
+++ b/src/ir/ty.rs
@@ -13,8 +13,8 @@ use super::template::{
     AsTemplateParam, TemplateInstantiation, TemplateParameters,
 };
 use super::traversal::{EdgeKind, Trace, Tracer};
-use clang::{self, Cursor};
-use parse::{ClangItemParser, ParseError, ParseResult};
+use crate::clang::{self, Cursor};
+use crate::parse::{ClangItemParser, ParseError, ParseResult};
 use std::borrow::Cow;
 use std::io;
 
diff --git a/src/ir/var.rs b/src/ir/var.rs
index e55308ce..e55311f3 100644
--- a/src/ir/var.rs
+++ b/src/ir/var.rs
@@ -6,10 +6,10 @@ use super::function::cursor_mangling;
 use super::int::IntKind;
 use super::item::Item;
 use super::ty::{FloatKind, TypeKind};
-use callbacks::MacroParsingBehavior;
+use crate::callbacks::MacroParsingBehavior;
 use cexpr;
-use clang;
-use parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
+use crate::clang;
+use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
 use std::io;
 use std::num::Wrapping;
 
diff --git a/src/lib.rs b/src/lib.rs
index 3eda6af9..158f1201 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -82,13 +82,13 @@ doc_mod!(ir, ir_docs);
 doc_mod!(parse, parse_docs);
 doc_mod!(regex_set, regex_set_docs);
 
-pub use codegen::{AliasVariation, EnumVariation};
-use features::RustFeatures;
-pub use features::{RustTarget, LATEST_STABLE_RUST, RUST_TARGET_STRINGS};
-use ir::context::{BindgenContext, ItemId};
-use ir::item::Item;
-use parse::{ClangItemParser, ParseError};
-use regex_set::RegexSet;
+pub use crate::codegen::{AliasVariation, EnumVariation};
+use crate::features::RustFeatures;
+pub use crate::features::{RustTarget, LATEST_STABLE_RUST, RUST_TARGET_STRINGS};
+use crate::ir::context::{BindgenContext, ItemId};
+use crate::ir::item::Item;
+use crate::parse::{ClangItemParser, ParseError};
+use crate::regex_set::RegexSet;
 
 use std::borrow::Cow;
 use std::fs::{File, OpenOptions};
@@ -2410,7 +2410,7 @@ impl callbacks::ParseCallbacks for CargoCallbacks {
 #[test]
 fn commandline_flag_unit_test_function() {
     //Test 1
-    let bindings = ::builder();
+    let bindings = crate::builder();
     let command_line_flags = bindings.command_line_flags();
 
     let test_cases = vec![
@@ -2428,7 +2428,7 @@ fn commandline_flag_unit_test_function() {
         .all(|ref x| command_line_flags.contains(x),));
 
     //Test 2
-    let bindings = ::builder()
+    let bindings = crate::builder()
         .header("input_header")
         .whitelist_type("Distinct_Type")
         .whitelist_function("safe_function");
diff --git a/src/main.rs b/src/main.rs
index 9cf03069..c554ac50 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,7 +15,7 @@ use std::panic;
 mod log_stubs;
 
 mod options;
-use options::builder_from_flags;
+use crate::options::builder_from_flags;
 
 fn clang_version_check() {
     let version = clang_version();
diff --git a/src/parse.rs b/src/parse.rs
index 1a9278b3..f60de431 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -1,8 +1,8 @@
 //! Common traits and types related to parsing our IR from Clang cursors.
 
-use clang;
-use ir::context::{BindgenContext, ItemId, TypeId};
-use ir::ty::TypeKind;
+use crate::clang;
+use crate::ir::context::{BindgenContext, ItemId, TypeId};
+use crate::ir::ty::TypeKind;
 
 /// Not so much an error in the traditional sense, but a control flow message
 /// when walking over Clang's AST with a cursor.