diff options
| -rw-r--r-- | src/clang.rs | 2 | ||||
| -rw-r--r-- | src/codegen/mod.rs | 2 | ||||
| -rw-r--r-- | src/ir/analysis/has_vtable.rs | 2 | ||||
| -rw-r--r-- | src/ir/analysis/mod.rs | 2 | ||||
| -rw-r--r-- | src/ir/analysis/sizedness.rs | 2 | ||||
| -rw-r--r-- | src/ir/comp.rs | 2 | ||||
| -rw-r--r-- | src/ir/context.rs | 8 | ||||
| -rw-r--r-- | src/ir/function.rs | 4 | ||||
| -rw-r--r-- | src/ir/item.rs | 6 | ||||
| -rw-r--r-- | src/ir/var.rs | 6 | ||||
| -rw-r--r-- | src/lib.rs | 4 |
11 files changed, 24 insertions, 16 deletions
diff --git a/src/clang.rs b/src/clang.rs index cae3207e..003ed2a6 100644 --- a/src/clang.rs +++ b/src/clang.rs @@ -4,9 +4,9 @@ #![allow(non_upper_case_globals, dead_code)] +use crate::ir::context::BindgenContext; use cexpr; use clang_sys::*; -use crate::ir::context::BindgenContext; use regex; use std::ffi::{CStr, CString}; use std::fmt; diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index cba9d66b..408d88bf 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -45,6 +45,7 @@ use crate::ir::var::Var; use proc_macro2::{self, Ident, Span}; use quote::TokenStreamExt; +use crate::{Entry, HashMap, HashSet}; use std; use std::borrow::Cow; use std::cell::Cell; @@ -53,7 +54,6 @@ use std::fmt::Write; use std::iter; use std::ops; use std::str::FromStr; -use crate::{Entry, HashMap, HashSet}; // Name of type defined in constified enum module pub static CONSTIFIED_ENUM_MODULE_REPR_NAME: &'static str = "Type"; diff --git a/src/ir/analysis/has_vtable.rs b/src/ir/analysis/has_vtable.rs index 9e0f9041..d2a57d5a 100644 --- a/src/ir/analysis/has_vtable.rs +++ b/src/ir/analysis/has_vtable.rs @@ -4,9 +4,9 @@ use super::{generate_dependencies, ConstrainResult, MonotoneFramework}; use crate::ir::context::{BindgenContext, ItemId}; use crate::ir::traversal::EdgeKind; use crate::ir::ty::TypeKind; +use crate::{Entry, HashMap}; use std::cmp; use std::ops; -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 4cfc9cb1..2cb021f0 100644 --- a/src/ir/analysis/mod.rs +++ b/src/ir/analysis/mod.rs @@ -56,9 +56,9 @@ pub use self::sizedness::{Sizedness, SizednessAnalysis, SizednessResult}; use crate::ir::context::{BindgenContext, ItemId}; use crate::ir::traversal::{EdgeKind, Trace}; +use crate::HashMap; use std::fmt; use std::ops; -use crate::HashMap; /// An analysis in the monotone framework. /// diff --git a/src/ir/analysis/sizedness.rs b/src/ir/analysis/sizedness.rs index 72a66d0d..d8bced72 100644 --- a/src/ir/analysis/sizedness.rs +++ b/src/ir/analysis/sizedness.rs @@ -7,8 +7,8 @@ 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 crate::{Entry, HashMap}; +use std::{cmp, ops}; /// The result of the `Sizedness` analysis for an individual item. /// diff --git a/src/ir/comp.rs b/src/ir/comp.rs index dca9312b..4eeb4745 100644 --- a/src/ir/comp.rs +++ b/src/ir/comp.rs @@ -13,11 +13,11 @@ 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 crate::HashMap; use peeking_take_while::PeekableExt; use std::cmp; use std::io; use std::mem; -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 27eb91d3..8ff102c0 100644 --- a/src/ir/context.rs +++ b/src/ir/context.rs @@ -20,18 +20,18 @@ use super::template::{TemplateInstantiation, TemplateParameters}; use super::traversal::{self, Edge, ItemTraversal}; use super::ty::{FloatKind, Type, TypeKind}; use crate::callbacks::ParseCallbacks; -use cexpr; use crate::clang::{self, Cursor}; -use clang_sys; use crate::parse::ClangItemParser; +use crate::BindgenOptions; +use crate::{Entry, HashMap, HashSet}; +use cexpr; +use clang_sys; 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 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/function.rs b/src/ir/function.rs index b22a7427..7efeb1b6 100644 --- a/src/ir/function.rs +++ b/src/ir/function.rs @@ -7,8 +7,10 @@ use super::item::Item; use super::traversal::{EdgeKind, Trace, Tracer}; use super::ty::TypeKind; use crate::clang; +use crate::parse::{ + ClangItemParser, ClangSubItemParser, ParseError, ParseResult, +}; use clang_sys::{self, CXCallingConv}; -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 f4ac6484..8e77ad71 100644 --- a/src/ir/item.rs +++ b/src/ir/item.rs @@ -19,9 +19,11 @@ use super::template::{AsTemplateParam, TemplateParameters}; use super::traversal::{EdgeKind, Trace, Tracer}; use super::ty::{Type, TypeKind}; use crate::clang; +use crate::parse::{ + ClangItemParser, ClangSubItemParser, ParseError, ParseResult, +}; use clang_sys; use lazycell::LazyCell; -use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult}; use regex; use std::cell::Cell; use std::collections::BTreeSet; @@ -1295,8 +1297,8 @@ impl ClangItemParser for Item { parent_id: Option<ItemId>, ctx: &mut BindgenContext, ) -> Result<ItemId, ParseError> { - use clang_sys::*; use crate::ir::var::Var; + use clang_sys::*; if !cursor.is_valid() { return Err(ParseError::Continue); diff --git a/src/ir/var.rs b/src/ir/var.rs index e55311f3..0f05a3ee 100644 --- a/src/ir/var.rs +++ b/src/ir/var.rs @@ -7,9 +7,11 @@ use super::int::IntKind; use super::item::Item; use super::ty::{FloatKind, TypeKind}; use crate::callbacks::MacroParsingBehavior; -use cexpr; use crate::clang; -use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult}; +use crate::parse::{ + ClangItemParser, ClangSubItemParser, ParseError, ParseResult, +}; +use cexpr; use std::io; use std::num::Wrapping; @@ -74,7 +74,9 @@ doc_mod!(regex_set, regex_set_docs); pub use crate::codegen::{AliasVariation, EnumVariation}; use crate::features::RustFeatures; -pub use crate::features::{RustTarget, LATEST_STABLE_RUST, RUST_TARGET_STRINGS}; +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}; |