From 278b3beafe11be3127b6780850d3d414e833e5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Br=C3=BCschweiler?= Date: Tue, 11 Jun 2013 11:40:10 +0200 Subject: [PATCH] decoder: better error message when failing to look up an id --- src/librustc/metadata/decoder.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index 81c1560f18bd..c5779dde499c 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -82,17 +82,17 @@ pub fn maybe_find_item(item_id: int, items: ebml::Doc) -> Option { } fn find_item(item_id: int, items: ebml::Doc) -> ebml::Doc { - return maybe_find_item(item_id, items).get(); + match maybe_find_item(item_id, items) { + None => fail!("lookup_item: id not found: %d", item_id), + Some(d) => d + } } // Looks up an item in the given metadata and returns an ebml doc pointing // to the item data. fn lookup_item(item_id: int, data: @~[u8]) -> ebml::Doc { let items = reader::get_doc(reader::Doc(data), tag_items); - match maybe_find_item(item_id, items) { - None => fail!("lookup_item: id not found: %d", item_id), - Some(d) => d - } + find_item(item_id, items) } #[deriving(Eq)]