Skip to content

Commit 6d2f907

Browse files
fitzgenfitzgen
committed
Run cargo fmt 
1 parent 67ff630 commit 6d2f907

File tree

7 files changed

+48
-40
lines changed

7 files changed

+48
-40
lines changed

‎src/codegen/mod.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ use ir::derive::{CanDeriveCopy, CanDeriveDebug, CanDeriveDefault};
1212
use ir::enum_ty::{Enum, EnumVariant, EnumVariantValue};
1313
use ir::function::{Function, FunctionSig};
1414
use ir::int::IntKind;
15-
use ir::item::{Item, ItemSet, ItemAncestors, ItemCanonicalName, ItemCanonicalPath};
15+
use ir::item::{Item, ItemAncestors, ItemCanonicalName, ItemCanonicalPath,
16+
ItemSet};
1617
use ir::item_kind::ItemKind;
1718
use ir::layout::Layout;
1819
use ir::module::Module;
@@ -2189,7 +2190,7 @@ impl ToRustTy for Type {
21892190
.map(|arg| arg.to_rust_ty(ctx))
21902191
.collect::<Vec<_>>();
21912192

2192-
path.segments.last_mut().unwrap().parameters = if
2193+
path.segments.last_mut().unwrap().parameters = if
21932194
template_args.is_empty() {
21942195
None
21952196
} else {

‎src/ir/comp.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use super::item::Item;
77
use super::layout::Layout;
88
use super::traversal::{EdgeKind, Trace, Tracer};
99
use super::ty::{TemplateDeclaration, Type};
10-
use super::traversal::Trace;
1110
use clang;
1211
use parse::{ClangItemParser, ParseError};
1312
use std::cell::Cell;
@@ -1079,11 +1078,8 @@ impl<'a> CanDeriveCopy<'a> for CompInfo {
10791078
impl Trace for CompInfo {
10801079
type Extra = Item;
10811080

1082-
fn trace<T>(&self,
1083-
context: &BindgenContext,
1084-
tracer: &mut T,
1085-
item: &Item)
1086-
where T: Tracer
1081+
fn trace<T>(&self, context: &BindgenContext, tracer: &mut T, item: &Item)
1082+
where T: Tracer,
10871083
{
10881084
// TODO: We should properly distinguish template instantiations from
10891085
// template declarations at the type level. Why are some template

‎src/ir/context.rs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use super::derive::{CanDeriveCopy, CanDeriveDebug, CanDeriveDefault};
44
use super::int::IntKind;
5-
use super::item::{Item, ItemSet, ItemCanonicalPath};
5+
use super::item::{Item, ItemCanonicalPath, ItemSet};
66
use super::item_kind::ItemKind;
77
use super::module::{Module, ModuleKind};
88
use super::traversal::{self, Edge, ItemTraversal};
@@ -152,8 +152,11 @@ pub struct BindgenContext<'ctx> {
152152
}
153153

154154
/// A traversal of whitelisted items.
155-
pub type WhitelistedItems<'ctx, 'gen> =
156-
ItemTraversal<'ctx, 'gen, ItemSet, Vec<ItemId>, fn(Edge) -> bool>;
155+
pub type WhitelistedItems<'ctx, 'gen> = ItemTraversal<'ctx,
156+
'gen,
157+
ItemSet,
158+
Vec<ItemId>,
159+
fn(Edge) -> bool>;
157160

158161
impl<'ctx> BindgenContext<'ctx> {
159162
/// Construct the context for the given `options`.
@@ -547,7 +550,9 @@ impl<'ctx> BindgenContext<'ctx> {
547550
assert!(self.current_module == self.root_module);
548551

549552
let roots = self.items().map(|(&id, _)| id);
550-
traversal::AssertNoDanglingItemsTraversal::new(self, roots, traversal::all_edges)
553+
traversal::AssertNoDanglingItemsTraversal::new(self,
554+
roots,
555+
traversal::all_edges)
551556
}
552557

553558
// This deserves a comment. Builtin types don't get a valid declaration, so

‎src/ir/function.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use super::context::{BindgenContext, ItemId};
44
use super::item::Item;
55
use super::traversal::{Trace, Tracer};
66
use super::ty::TypeKind;
7-
use super::traversal::Trace;
87
use clang;
98
use clang_sys::CXCallingConv;
109
use parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
@@ -320,11 +319,8 @@ impl ClangSubItemParser for Function {
320319
impl Trace for FunctionSig {
321320
type Extra = ();
322321

323-
fn trace<T>(&self,
324-
_: &BindgenContext,
325-
tracer: &mut T,
326-
_: &())
327-
where T: Tracer
322+
fn trace<T>(&self, _: &BindgenContext, tracer: &mut T, _: &())
323+
where T: Tracer,
328324
{
329325
tracer.visit(self.return_type());
330326

‎src/ir/item.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use super::item_kind::ItemKind;
88
use super::module::Module;
99
use super::traversal::{Trace, Tracer};
1010
use super::ty::{TemplateDeclaration, Type, TypeKind};
11-
use super::traversal::Trace;
1211
use clang;
1312
use clang_sys;
1413
use parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
@@ -172,7 +171,7 @@ impl Trace for ItemId {
172171
type Extra = ();
173172

174173
fn trace<T>(&self, ctx: &BindgenContext, tracer: &mut T, extra: &())
175-
where T: Tracer
174+
where T: Tracer,
176175
{
177176
ctx.resolve_item(*self).trace(ctx, tracer, extra);
178177
}
@@ -182,7 +181,7 @@ impl Trace for Item {
182181
type Extra = ();
183182

184183
fn trace<T>(&self, ctx: &BindgenContext, tracer: &mut T, _extra: &())
185-
where T: Tracer
184+
where T: Tracer,
186185
{
187186
if self.is_hidden(ctx) {
188187
return;

‎src/ir/traversal.rs‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! Traversal of the graph of IR items and types.
22
3-
use std::collections::{BTreeMap, VecDeque};
43
use super::context::{BindgenContext, ItemId};
54
use super::item::ItemSet;
5+
use std::collections::{BTreeMap, VecDeque};
66

77
/// An outgoing edge in the IR graph is a reference from some item to another
88
/// item:
@@ -14,7 +14,7 @@ use super::item::ItemSet;
1414
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
1515
pub struct Edge {
1616
to: ItemId,
17-
kind: EdgeKind
17+
kind: EdgeKind,
1818
}
1919

2020
impl Edge {
@@ -119,18 +119,20 @@ impl<'ctx, 'gen> TraversalStorage<'ctx, 'gen> for ItemSet {
119119
/// each item. This is useful for providing debug assertions with meaningful
120120
/// diagnostic messages about dangling items.
121121
#[derive(Debug)]
122-
pub struct Paths<'ctx, 'gen>(BTreeMap<ItemId, ItemId>, &'ctx BindgenContext<'gen>)
122+
pub struct Paths<'ctx, 'gen>(BTreeMap<ItemId, ItemId>,
123+
&'ctx BindgenContext<'gen>)
123124
where 'gen: 'ctx;
124125

125126
impl<'ctx, 'gen> TraversalStorage<'ctx, 'gen> for Paths<'ctx, 'gen>
126-
where 'gen: 'ctx
127+
where 'gen: 'ctx,
127128
{
128129
fn new(ctx: &'ctx BindgenContext<'gen>) -> Self {
129130
Paths(BTreeMap::new(), ctx)
130131
}
131132

132133
fn add(&mut self, from: Option<ItemId>, item: ItemId) -> bool {
133-
let newly_discovered = self.0.insert(item, from.unwrap_or(item)).is_none();
134+
let newly_discovered =
135+
self.0.insert(item, from.unwrap_or(item)).is_none();
134136

135137
if self.1.resolve_item_fallible(item).is_none() {
136138
let mut path = vec![];
@@ -241,7 +243,11 @@ pub struct ItemTraversal<'ctx, 'gen, Storage, Queue, Predicate>
241243
currently_traversing: Option<ItemId>,
242244
}
243245

244-
impl<'ctx, 'gen, Storage, Queue, Predicate> ItemTraversal<'ctx, 'gen, Storage, Queue, Predicate>
246+
impl<'ctx, 'gen, Storage, Queue, Predicate> ItemTraversal<'ctx,
247+
'gen,
248+
Storage,
249+
Queue,
250+
Predicate>
245251
where 'gen: 'ctx,
246252
Storage: TraversalStorage<'ctx, 'gen>,
247253
Queue: TraversalQueue,
@@ -272,7 +278,8 @@ impl<'ctx, 'gen, Storage, Queue, Predicate> ItemTraversal<'ctx, 'gen, Storage, Q
272278
}
273279
}
274280

275-
impl<'ctx, 'gen, Storage, Queue, Predicate> Tracer for ItemTraversal<'ctx, 'gen, Storage, Queue, Predicate>
281+
impl<'ctx, 'gen, Storage, Queue, Predicate> Tracer
282+
for ItemTraversal<'ctx, 'gen, Storage, Queue, Predicate>
276283
where 'gen: 'ctx,
277284
Storage: TraversalStorage<'ctx, 'gen>,
278285
Queue: TraversalQueue,
@@ -283,15 +290,17 @@ impl<'ctx, 'gen, Storage, Queue, Predicate> Tracer for ItemTraversal<'ctx, 'gen,
283290
if !self.predicate.should_follow(edge) {
284291
return;
285292
}
286-
287-
let is_newly_discovered = self.seen.add(self.currently_traversing, item);
293+
294+
let is_newly_discovered = self.seen
295+
.add(self.currently_traversing, item);
288296
if is_newly_discovered {
289297
self.queue.push(item)
290298
}
291299
}
292300
}
293301

294-
impl<'ctx, 'gen, Storage, Queue, Predicate> Iterator for ItemTraversal<'ctx, 'gen, Storage, Queue, Predicate>
302+
impl<'ctx, 'gen, Storage, Queue, Predicate> Iterator
303+
for ItemTraversal<'ctx, 'gen, Storage, Queue, Predicate>
295304
where 'gen: 'ctx,
296305
Storage: TraversalStorage<'ctx, 'gen>,
297306
Queue: TraversalQueue,
@@ -324,7 +333,11 @@ impl<'ctx, 'gen, Storage, Queue, Predicate> Iterator for ItemTraversal<'ctx, 'ge
324333
/// See `BindgenContext::assert_no_dangling_item_traversal` for more
325334
/// information.
326335
pub type AssertNoDanglingItemsTraversal<'ctx, 'gen> =
327-
ItemTraversal<'ctx, 'gen, Paths<'ctx, 'gen>, VecDeque<ItemId>, fn(Edge) -> bool>;
336+
ItemTraversal<'ctx,
337+
'gen,
338+
Paths<'ctx, 'gen>,
339+
VecDeque<ItemId>,
340+
fn(Edge) -> bool>;
328341

329342
#[cfg(test)]
330343
mod tests {

‎src/ir/ty.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,9 @@ impl Type {
10261026
CXType_MemberPointer |
10271027
CXType_Pointer => {
10281028
let inner = Item::from_ty_or_ref(ty.pointee_type().unwrap(),
1029-
location, None, ctx);
1029+
location,
1030+
None,
1031+
ctx);
10301032
TypeKind::Pointer(inner)
10311033
}
10321034
CXType_BlockPointer => TypeKind::BlockPointer,
@@ -1067,8 +1069,7 @@ impl Type {
10671069
}
10681070
CXType_Typedef => {
10691071
let inner = cursor.typedef_type().expect("Not valid Type?");
1070-
let inner =
1071-
Item::from_ty_or_ref(inner, location, None, ctx);
1072+
let inner = Item::from_ty_or_ref(inner, location, None, ctx);
10721073
TypeKind::Alias(inner)
10731074
}
10741075
CXType_Enum => {
@@ -1128,11 +1129,8 @@ impl Type {
11281129
impl Trace for Type {
11291130
type Extra = Item;
11301131

1131-
fn trace<T>(&self,
1132-
context: &BindgenContext,
1133-
tracer: &mut T,
1134-
item: &Item)
1135-
where T: Tracer
1132+
fn trace<T>(&self, context: &BindgenContext, tracer: &mut T, item: &Item)
1133+
where T: Tracer,
11361134
{
11371135
match *self.kind() {
11381136
TypeKind::Pointer(inner) |

0 commit comments

Comments
 (0)