Skip to content

Commit dcace12

Browse files
committed
---
yaml --- r: 169861 b: refs/heads/auto c: 7ee5863 h: refs/heads/master i: 169859: d9f0e1e v: v3
1 parent 6aca7cf commit dcace12

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 9989288438e979ea256fa746e2fe3f7cdc00b001
13+
refs/heads/auto: 7ee58632023c4941408264eeef34a68277773408
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc_typeck/collect.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ impl<'a, 'tcx> AstConv<'tcx> for CollectCtxt<'a, 'tcx> {
160160
}
161161

162162
match self.tcx.map.find(id.node) {
163-
Some(ast_map::NodeItem(item)) => ty_of_item(self, &*item),
163+
Some(ast_map::NodeItem(item)) => {
164+
ty_of_item(self, &*item)
165+
}
164166
Some(ast_map::NodeForeignItem(foreign_item)) => {
165167
let abi = self.tcx.map.get_foreign_abi(id.node);
166168
ty_of_foreign_item(self, &*foreign_item, abi)
@@ -819,8 +821,8 @@ fn get_trait_def<'a, 'tcx>(ccx: &CollectCtxt<'a, 'tcx>,
819821
}
820822

821823
fn trait_def_of_item<'a, 'tcx>(ccx: &CollectCtxt<'a, 'tcx>,
822-
it: &ast::Item)
823-
-> Rc<ty::TraitDef<'tcx>>
824+
it: &ast::Item)
825+
-> Rc<ty::TraitDef<'tcx>>
824826
{
825827
let def_id = local_def(it.id);
826828
let tcx = ccx.tcx;

0 commit comments

Comments
 (0)