From 981f2b115ff9f61e9670feb2d30aec3a1fe26453 Mon Sep 17 00:00:00 2001 From: Karan Dhareshwar Date: Thu, 24 Oct 2024 12:27:54 -0500 Subject: [PATCH 1/2] Fix for PR 4897 --- lib/cli/dictionary_item_str_params.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/cli/dictionary_item_str_params.rs b/lib/cli/dictionary_item_str_params.rs index 0ef60ae2..2ad4da5c 100644 --- a/lib/cli/dictionary_item_str_params.rs +++ b/lib/cli/dictionary_item_str_params.rs @@ -112,10 +112,15 @@ impl<'a> TryFrom> for DictionaryItemIdentifier { error, } })?; - let entity_addr = key.as_entity_addr().ok_or(CliError::InvalidArgument { - context: "dictionary item entity named key", - error: "not a entity-addr".to_string(), - })?; + + let entity_addr = if let Key::AddressableEntity(addr) = key { + addr + } else { + return Err(CliError::InvalidArgument { + context: "dictionary item entity named key", + error: "not a entity-addr".to_string(), + }) + }; Ok(DictionaryItemIdentifier::new_from_entity_info( entity_addr, dictionary_name.to_string(), From bd4662103991e0ceefbf753b4e69bbd3756bdd05 Mon Sep 17 00:00:00 2001 From: Karan Dhareshwar Date: Thu, 24 Oct 2024 12:30:40 -0500 Subject: [PATCH 2/2] Run make format --- lib/cli/dictionary_item_str_params.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cli/dictionary_item_str_params.rs b/lib/cli/dictionary_item_str_params.rs index 2ad4da5c..9138b0b7 100644 --- a/lib/cli/dictionary_item_str_params.rs +++ b/lib/cli/dictionary_item_str_params.rs @@ -115,11 +115,11 @@ impl<'a> TryFrom> for DictionaryItemIdentifier { let entity_addr = if let Key::AddressableEntity(addr) = key { addr - } else { + } else { return Err(CliError::InvalidArgument { context: "dictionary item entity named key", error: "not a entity-addr".to_string(), - }) + }); }; Ok(DictionaryItemIdentifier::new_from_entity_info( entity_addr,