Skip to content

Commit 84b8eb1

Browse files
committed
---
yaml --- r: 4157 b: refs/heads/master c: 95b926f h: refs/heads/master i: 4155: 8704b59 v: v3
1 parent 4685da8 commit 84b8eb1

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: bcb5c4d54f601d6066d6fa463390d3d8b30f53b7
2+
refs/heads/master: 95b926f675b476757d4568af876c0660131a9c4c

trunk/src/comp/middle/resolve.rs

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,17 +1117,12 @@ fn index_mod(&ast::_mod md) -> mod_index {
11171117
auto index = new_str_hash[list[mod_index_entry]]();
11181118
for (@ast::view_item it in md.view_items) {
11191119
alt (it.node) {
1120-
case (ast::view_item_use(?ident, _, _)) {
1121-
add_to_index(index, ident, mie_view_item(it));
1122-
}
1123-
case (ast::view_item_import(?def_ident, _, _)) {
1124-
add_to_index(index, def_ident, mie_view_item(it));
1125-
}
1126-
case (
1127-
//globbed imports have to be resolved lazily.
1128-
ast::view_item_import_glob(_, _)) {
1129-
}
1130-
case (ast::view_item_export(_, _)) { }
1120+
ast::view_item_import(?ident, _, _) |
1121+
ast::view_item_use(?ident, _, _) {
1122+
add_to_index(index, ident, mie_view_item(it));
1123+
}
1124+
//globbed imports have to be resolved lazily.
1125+
ast::view_item_import_glob(_, _) | ast::view_item_export(_, _) {}
11311126
}
11321127
}
11331128
for (@ast::item it in md.items) {
@@ -1155,11 +1150,11 @@ fn index_nmod(&ast::native_mod md) -> mod_index {
11551150
auto index = new_str_hash[list[mod_index_entry]]();
11561151
for (@ast::view_item it in md.view_items) {
11571152
alt (it.node) {
1158-
case (ast::view_item_import(?def_ident, _, _)) {
1159-
add_to_index(index, def_ident, mie_view_item(it));
1160-
}
1161-
case (ast::view_item_import_glob(_, _)) { }
1162-
case (ast::view_item_export(_, _)) { }
1153+
ast::view_item_use(?ident, _, _) |
1154+
ast::view_item_import(?ident, _, _) {
1155+
add_to_index(index, ident, mie_view_item(it));
1156+
}
1157+
ast::view_item_import_glob(_, _) | ast::view_item_export(_, _) {}
11631158
}
11641159
}
11651160
for (@ast::native_item it in md.items) {

0 commit comments

Comments
 (0)