From 85a8ecd5bc5ea639cf55b6ff7c52a2cd664f3dae Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 31 Jul 2024 12:56:09 +0200 Subject: [PATCH] Rename `from_boxed_string_unchecked` to `from_boxed_str_unchecked` --- commons/zenoh-keyexpr/src/key_expr/owned.rs | 4 ++-- zenoh/src/api/key_expr.rs | 8 ++++---- zenoh/src/api/session.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/zenoh-keyexpr/src/key_expr/owned.rs b/commons/zenoh-keyexpr/src/key_expr/owned.rs index 6089df2a1e..517de97658 100644 --- a/commons/zenoh-keyexpr/src/key_expr/owned.rs +++ b/commons/zenoh-keyexpr/src/key_expr/owned.rs @@ -71,13 +71,13 @@ impl OwnedKeyExpr { /// Key Expressions must follow some rules to be accepted by a Zenoh network. /// Messages addressed with invalid key expressions will be dropped. pub unsafe fn from_string_unchecked(s: String) -> Self { - Self::from_boxed_string_unchecked(s.into_boxed_str()) + Self::from_boxed_str_unchecked(s.into_boxed_str()) } /// Constructs an OwnedKeyExpr without checking [`keyexpr`]'s invariants /// # Safety /// Key Expressions must follow some rules to be accepted by a Zenoh network. /// Messages addressed with invalid key expressions will be dropped. - pub unsafe fn from_boxed_string_unchecked(s: Box) -> Self { + pub unsafe fn from_boxed_str_unchecked(s: Box) -> Self { OwnedKeyExpr(s.into()) } } diff --git a/zenoh/src/api/key_expr.rs b/zenoh/src/api/key_expr.rs index 81d9aecc20..dbd44a85c6 100644 --- a/zenoh/src/api/key_expr.rs +++ b/zenoh/src/api/key_expr.rs @@ -81,10 +81,10 @@ impl KeyExpr<'static> { /// # Safety /// Key Expressions must follow some rules to be accepted by a Zenoh network. /// Messages addressed with invalid key expressions will be dropped. - pub unsafe fn from_boxed_string_unchecked(s: Box) -> Self { - Self(KeyExprInner::Owned( - OwnedKeyExpr::from_boxed_string_unchecked(s), - )) + pub unsafe fn from_boxed_str_unchecked(s: Box) -> Self { + Self(KeyExprInner::Owned(OwnedKeyExpr::from_boxed_str_unchecked( + s, + ))) } } impl<'a> KeyExpr<'a> { diff --git a/zenoh/src/api/session.rs b/zenoh/src/api/session.rs index 4ca924e023..587ec58f33 100644 --- a/zenoh/src/api/session.rs +++ b/zenoh/src/api/session.rs @@ -337,7 +337,7 @@ pub(crate) enum Resource { impl Resource { pub(crate) fn new(name: Box) -> Self { if keyexpr::new(name.as_ref()).is_ok() { - Self::for_keyexpr(unsafe { OwnedKeyExpr::from_boxed_string_unchecked(name) }) + Self::for_keyexpr(unsafe { OwnedKeyExpr::from_boxed_str_unchecked(name) }) } else { Self::Prefix { prefix: name } }