Skip to content

Commit 7bf15ff

Browse files
committed
---
yaml --- r: 172877 b: refs/heads/try c: dc41625 h: refs/heads/master i: 172875: 8396b55 v: v3
1 parent 8bec116 commit 7bf15ff

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 170c4399e614fe599c3d41306b3429ca8b3b68c6
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
5-
refs/heads/try: 98713495562428a788736dea0544bfe402158143
5+
refs/heads/try: dc41625e15fcc4fe8a70b5a8ed644e0c35c8f591
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc_typeck/collect.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ fn convert(ccx: &CollectCtxt, it: &ast::Item) {
555555
debug!("convert: item {} with id {}", token::get_ident(it.ident), it.id);
556556
match it.node {
557557
// These don't define types.
558+
ast::ItemExternCrate(_) | ast::ItemUse(_) |
558559
ast::ItemForeignMod(_) | ast::ItemMod(_) | ast::ItemMac(_) => {}
559560
ast::ItemEnum(ref enum_definition, ref generics) => {
560561
let scheme = ty_of_item(ccx, it);
@@ -1004,6 +1005,7 @@ fn ty_of_item<'a, 'tcx>(ccx: &CollectCtxt<'a, 'tcx>, it: &ast::Item)
10041005
tcx.tcache.borrow_mut().insert(local_def(it.id), scheme.clone());
10051006
return scheme;
10061007
}
1008+
ast::ItemExternCrate(_) | ast::ItemUse(_) |
10071009
ast::ItemImpl(..) | ast::ItemMod(_) |
10081010
ast::ItemForeignMod(_) | ast::ItemMac(_) => panic!(),
10091011
}

branches/try/src/librustc_typeck/variance.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,8 @@ impl<'a, 'tcx, 'v> Visitor<'v> for TermsContext<'a, 'tcx> {
380380
visit::walk_item(self, item);
381381
}
382382

383+
ast::ItemExternCrate(_) |
384+
ast::ItemUse(_) |
383385
ast::ItemImpl(..) |
384386
ast::ItemStatic(..) |
385387
ast::ItemConst(..) |
@@ -532,6 +534,8 @@ impl<'a, 'tcx, 'v> Visitor<'v> for ConstraintContext<'a, 'tcx> {
532534
}
533535
}
534536

537+
ast::ItemExternCrate(_) |
538+
ast::ItemUse(_) |
535539
ast::ItemStatic(..) |
536540
ast::ItemConst(..) |
537541
ast::ItemFn(..) |

0 commit comments

Comments
 (0)