Skip to content

Commit 278b3be

Browse files
committed
decoder: better error message when failing to look up an id
1 parent 1ac90bb commit 278b3be

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/librustc/metadata/decoder.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,17 @@ pub fn maybe_find_item(item_id: int, items: ebml::Doc) -> Option<ebml::Doc> {
8282
}
8383

8484
fn find_item(item_id: int, items: ebml::Doc) -> ebml::Doc {
85-
return maybe_find_item(item_id, items).get();
85+
match maybe_find_item(item_id, items) {
86+
None => fail!("lookup_item: id not found: %d", item_id),
87+
Some(d) => d
88+
}
8689
}
8790

8891
// Looks up an item in the given metadata and returns an ebml doc pointing
8992
// to the item data.
9093
fn lookup_item(item_id: int, data: @~[u8]) -> ebml::Doc {
9194
let items = reader::get_doc(reader::Doc(data), tag_items);
92-
match maybe_find_item(item_id, items) {
93-
None => fail!("lookup_item: id not found: %d", item_id),
94-
Some(d) => d
95-
}
95+
find_item(item_id, items)
9696
}
9797

9898
#[deriving(Eq)]

0 commit comments

Comments
 (0)