From 88211f6418a51870a85f2c04920b72d3cad8b6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Wed, 20 Mar 2024 16:37:29 +0100 Subject: Add no std if only building mqttv5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- mqtt-format/src/lib.rs | 2 +- mqtt-format/src/v5/packets/suback.rs | 2 +- mqtt-format/src/v5/packets/subscribe.rs | 4 ++-- mqtt-format/src/v5/packets/unsuback.rs | 2 +- mqtt-format/src/v5/packets/unsubscribe.rs | 4 ++-- mqtt-format/src/v5/properties.rs | 2 +- mqtt-format/src/v5/strings.rs | 2 +- mqtt-format/src/v5/util.rs | 4 ++-- mqtt-format/src/v5/variable_header.rs | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mqtt-format/src/lib.rs b/mqtt-format/src/lib.rs index db654df..bed8140 100644 --- a/mqtt-format/src/lib.rs +++ b/mqtt-format/src/lib.rs @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. // - +#![cfg_attr(all(feature = "mqttv5", not(feature = "mqttv3"), not(test)), no_std)] #![deny(clippy::disallowed_methods)] #![deny(clippy::disallowed_types)] diff --git a/mqtt-format/src/v5/packets/suback.rs b/mqtt-format/src/v5/packets/suback.rs index 7138e1e..ee185a5 100644 --- a/mqtt-format/src/v5/packets/suback.rs +++ b/mqtt-format/src/v5/packets/suback.rs @@ -66,7 +66,7 @@ impl<'i> MSuback<'i> { // SAFETY: We verified above that the payload slice only contains valid SubackReasonCode // bytes - let reasons: &[SubackReasonCode] = unsafe { std::mem::transmute(payload) }; + let reasons: &[SubackReasonCode] = unsafe { core::mem::transmute(payload) }; Ok(Self { packet_identifier, diff --git a/mqtt-format/src/v5/packets/subscribe.rs b/mqtt-format/src/v5/packets/subscribe.rs index 04ea2f9..580bbec 100644 --- a/mqtt-format/src/v5/packets/subscribe.rs +++ b/mqtt-format/src/v5/packets/subscribe.rs @@ -97,8 +97,8 @@ pub struct Subscriptions<'i> { start: &'i [u8], } -impl<'i> std::fmt::Debug for Subscriptions<'i> { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { +impl<'i> core::fmt::Debug for Subscriptions<'i> { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { f.debug_struct("Subscriptions").finish() } } diff --git a/mqtt-format/src/v5/packets/unsuback.rs b/mqtt-format/src/v5/packets/unsuback.rs index 89b0065..d372da0 100644 --- a/mqtt-format/src/v5/packets/unsuback.rs +++ b/mqtt-format/src/v5/packets/unsuback.rs @@ -56,7 +56,7 @@ impl<'i> MUnsuback<'i> { // SAFETY: We verified above that the payload slice only contains valid UnsubackReasonCode // bytes - let reasons: &[UnsubackReasonCode] = unsafe { std::mem::transmute(payload) }; + let reasons: &[UnsubackReasonCode] = unsafe { core::mem::transmute(payload) }; Ok(Self { packet_identifier, diff --git a/mqtt-format/src/v5/packets/unsubscribe.rs b/mqtt-format/src/v5/packets/unsubscribe.rs index 278871f..eea3850 100644 --- a/mqtt-format/src/v5/packets/unsubscribe.rs +++ b/mqtt-format/src/v5/packets/unsubscribe.rs @@ -31,8 +31,8 @@ pub struct Unsubscriptions<'i> { start: &'i [u8], } -impl<'i> std::fmt::Debug for Unsubscriptions<'i> { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { +impl<'i> core::fmt::Debug for Unsubscriptions<'i> { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { f.debug_struct("Unsubscriptions").finish() } } diff --git a/mqtt-format/src/v5/properties.rs b/mqtt-format/src/v5/properties.rs index 10e42dd..3ab5796 100644 --- a/mqtt-format/src/v5/properties.rs +++ b/mqtt-format/src/v5/properties.rs @@ -53,7 +53,7 @@ macro_rules! define_properties { $( $((anker: $prop_anker:literal ))? $prop_name:ident : $prop:ty),* $(,)? }) => { $( - #[doc = std::concat!("Properties helper type for the [", std::stringify!($packettypename), "] type.")] + #[doc = core::concat!("Properties helper type for the [", core::stringify!($packettypename), "] type.")] #[doc = ""] // newline )? $( diff --git a/mqtt-format/src/v5/strings.rs b/mqtt-format/src/v5/strings.rs index 8d469cd..48fb102 100644 --- a/mqtt-format/src/v5/strings.rs +++ b/mqtt-format/src/v5/strings.rs @@ -17,7 +17,7 @@ pub fn parse_string<'i>(input: &mut &'i Bytes) -> MResult<&'i str> { winnow::combinator::trace("mqtt_string", |input: &mut &'i Bytes| { let maybe_str = length_take(parse_u16).parse_next(input)?; - std::str::from_utf8(maybe_str) + core::str::from_utf8(maybe_str) .map_err(|e| ErrMode::from_external_error(input, winnow::error::ErrorKind::Verify, e)) }) .parse_next(input) diff --git a/mqtt-format/src/v5/util.rs b/mqtt-format/src/v5/util.rs index f0375eb..3b13d50 100644 --- a/mqtt-format/src/v5/util.rs +++ b/mqtt-format/src/v5/util.rs @@ -6,7 +6,7 @@ macro_rules! speclink { ($anker:literal) => { - std::concat!( + core::concat!( "https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#", $anker ) @@ -16,7 +16,7 @@ pub(crate) use speclink; macro_rules! md_speclink { ($anker:literal) => { - std::concat!( + core::concat!( "[📖 Specification](", $crate::v5::util::speclink!($anker), ")" diff --git a/mqtt-format/src/v5/variable_header.rs b/mqtt-format/src/v5/variable_header.rs index 22575b2..fca22e0 100644 --- a/mqtt-format/src/v5/variable_header.rs +++ b/mqtt-format/src/v5/variable_header.rs @@ -124,8 +124,8 @@ define_properties! {[ pub struct UserProperties<'i>(pub &'i [u8]); -impl<'i> std::fmt::Debug for UserProperties<'i> { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { +impl<'i> core::fmt::Debug for UserProperties<'i> { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { f.debug_tuple("UserProperties").finish() } } -- cgit v1.2.3