Skip to content

Commit

Permalink
Run cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
jyn514 committed Apr 27, 2020
1 parent 2eac766 commit aa4440a
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/clang.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/codegen/mod.rs
Expand Up @@ -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;
Expand All @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/ir/analysis/has_vtable.rs
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/ir/analysis/mod.rs
Expand Up @@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion src/ir/analysis/sizedness.rs
Expand Up @@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion src/ir/comp.rs
Expand Up @@ -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)]
Expand Down
8 changes: 4 additions & 4 deletions src/ir/context.rs
Expand Up @@ -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)]
Expand Down
4 changes: 3 additions & 1 deletion src/ir/function.rs
Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions src/ir/item.rs
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions src/ir/var.rs
Expand Up @@ -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;

Expand Down
4 changes: 3 additions & 1 deletion src/lib.rs
Expand Up @@ -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};
Expand Down

0 comments on commit aa4440a

Please sign in to comment.