Skip to content

Commit aa4440a

Browse files
committed
Run cargo fmt
1 parent 2eac766 commit aa4440a

File tree

11 files changed

+24
-16
lines changed

11 files changed

+24
-16
lines changed

src/clang.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#![allow(non_upper_case_globals, dead_code)]
55

66

7+
use crate::ir::context::BindgenContext;
78
use cexpr;
89
use clang_sys::*;
9-
use crate::ir::context::BindgenContext;
1010
use regex;
1111
use std::ffi::{CStr, CString};
1212
use std::fmt;

src/codegen/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ use crate::ir::var::Var;
4545
use proc_macro2::{self, Ident, Span};
4646
use quote::TokenStreamExt;
4747

48+
use crate::{Entry, HashMap, HashSet};
4849
use std;
4950
use std::borrow::Cow;
5051
use std::cell::Cell;
@@ -53,7 +54,6 @@ use std::fmt::Write;
5354
use std::iter;
5455
use std::ops;
5556
use std::str::FromStr;
56-
use crate::{Entry, HashMap, HashSet};
5757

5858
// Name of type defined in constified enum module
5959
pub static CONSTIFIED_ENUM_MODULE_REPR_NAME: &'static str = "Type";

src/ir/analysis/has_vtable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use super::{generate_dependencies, ConstrainResult, MonotoneFramework};
44
use crate::ir::context::{BindgenContext, ItemId};
55
use crate::ir::traversal::EdgeKind;
66
use crate::ir::ty::TypeKind;
7+
use crate::{Entry, HashMap};
78
use std::cmp;
89
use std::ops;
9-
use crate::{Entry, HashMap};
1010

1111
/// The result of the `HasVtableAnalysis` for an individual item.
1212
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]

src/ir/analysis/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ pub use self::sizedness::{Sizedness, SizednessAnalysis, SizednessResult};
5656
use crate::ir::context::{BindgenContext, ItemId};
5757

5858
use crate::ir::traversal::{EdgeKind, Trace};
59+
use crate::HashMap;
5960
use std::fmt;
6061
use std::ops;
61-
use crate::HashMap;
6262

6363
/// An analysis in the monotone framework.
6464
///

src/ir/analysis/sizedness.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use crate::ir::context::{BindgenContext, TypeId};
77
use crate::ir::item::IsOpaque;
88
use crate::ir::traversal::EdgeKind;
99
use crate::ir::ty::TypeKind;
10-
use std::{cmp, ops};
1110
use crate::{Entry, HashMap};
11+
use std::{cmp, ops};
1212

1313
/// The result of the `Sizedness` analysis for an individual item.
1414
///

src/ir/comp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ use crate::clang;
1313
use crate::codegen::struct_layout::{align_to, bytes_from_bits_pow2};
1414
use crate::ir::derive::CanDeriveCopy;
1515
use crate::parse::{ClangItemParser, ParseError};
16+
use crate::HashMap;
1617
use peeking_take_while::PeekableExt;
1718
use std::cmp;
1819
use std::io;
1920
use std::mem;
20-
use crate::HashMap;
2121

2222
/// The kind of compound type.
2323
#[derive(Debug, Copy, Clone, PartialEq)]

src/ir/context.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ use super::template::{TemplateInstantiation, TemplateParameters};
2020
use super::traversal::{self, Edge, ItemTraversal};
2121
use super::ty::{FloatKind, Type, TypeKind};
2222
use crate::callbacks::ParseCallbacks;
23-
use cexpr;
2423
use crate::clang::{self, Cursor};
25-
use clang_sys;
2624
use crate::parse::ClangItemParser;
25+
use crate::BindgenOptions;
26+
use crate::{Entry, HashMap, HashSet};
27+
use cexpr;
28+
use clang_sys;
2729
use proc_macro2::{Ident, Span};
2830
use std::borrow::Cow;
2931
use std::cell::Cell;
3032
use std::collections::HashMap as StdHashMap;
3133
use std::iter::IntoIterator;
3234
use std::mem;
33-
use crate::BindgenOptions;
34-
use crate::{Entry, HashMap, HashSet};
3535

3636
/// An identifier for some kind of IR item.
3737
#[derive(Debug, Copy, Clone, Eq, PartialOrd, Ord, Hash)]

src/ir/function.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ use super::item::Item;
77
use super::traversal::{EdgeKind, Trace, Tracer};
88
use super::ty::TypeKind;
99
use crate::clang;
10+
use crate::parse::{
11+
ClangItemParser, ClangSubItemParser, ParseError, ParseResult,
12+
};
1013
use clang_sys::{self, CXCallingConv};
11-
use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
1214
use proc_macro2;
1315
use quote;
1416
use quote::TokenStreamExt;

src/ir/item.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ use super::template::{AsTemplateParam, TemplateParameters};
1919
use super::traversal::{EdgeKind, Trace, Tracer};
2020
use super::ty::{Type, TypeKind};
2121
use crate::clang;
22+
use crate::parse::{
23+
ClangItemParser, ClangSubItemParser, ParseError, ParseResult,
24+
};
2225
use clang_sys;
2326
use lazycell::LazyCell;
24-
use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
2527
use regex;
2628
use std::cell::Cell;
2729
use std::collections::BTreeSet;
@@ -1295,8 +1297,8 @@ impl ClangItemParser for Item {
12951297
parent_id: Option<ItemId>,
12961298
ctx: &mut BindgenContext,
12971299
) -> Result<ItemId, ParseError> {
1298-
use clang_sys::*;
12991300
use crate::ir::var::Var;
1301+
use clang_sys::*;
13001302

13011303
if !cursor.is_valid() {
13021304
return Err(ParseError::Continue);

src/ir/var.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ use super::int::IntKind;
77
use super::item::Item;
88
use super::ty::{FloatKind, TypeKind};
99
use crate::callbacks::MacroParsingBehavior;
10-
use cexpr;
1110
use crate::clang;
12-
use crate::parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
11+
use crate::parse::{
12+
ClangItemParser, ClangSubItemParser, ParseError, ParseResult,
13+
};
14+
use cexpr;
1315
use std::io;
1416
use std::num::Wrapping;
1517

src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ doc_mod!(regex_set, regex_set_docs);
7474

7575
pub use crate::codegen::{AliasVariation, EnumVariation};
7676
use crate::features::RustFeatures;
77-
pub use crate::features::{RustTarget, LATEST_STABLE_RUST, RUST_TARGET_STRINGS};
77+
pub use crate::features::{
78+
RustTarget, LATEST_STABLE_RUST, RUST_TARGET_STRINGS,
79+
};
7880
use crate::ir::context::{BindgenContext, ItemId};
7981
use crate::ir::item::Item;
8082
use crate::parse::{ClangItemParser, ParseError};

0 commit comments

Comments
 (0)