Refactor: move map_err macro back inside include! to helpers module

Signed-off-by: Joshua Potts <[email protected]>

Author: iamjpotts

russh/src/helpers.rs

@@ -52,6 +52,20 @@ impl Decode for NameList {
     type Error = ssh_encoding::Error;
 }
 
+pub(crate) mod macros {
+    #[allow(clippy::crate_in_macro_def)]
+    macro_rules! map_err {
+        ($result:expr) => {
+            $result.map_err(|e| crate::Error::from(e))
+        };
+    }
+
+    pub(crate) use map_err;
+}
+
+#[cfg(any(feature = "ring", feature = "aws-lc-rs"))]
+pub(crate) use macros::map_err;
+
 #[doc(hidden)]
 pub fn sign_with_hash_alg(key: &PrivateKeyWithHashAlg, data: &[u8]) -> ssh_key::Result<Vec<u8>> {
     Ok(match key.key_data() {

russh/src/lib.rs

@@ -94,13 +94,3 @@ compile_error!(
 
 #[cfg(any(feature = "ring", feature = "aws-lc-rs"))]
 include!("lib_inner.rs");
-
-#[cfg(any(feature = "ring", feature = "aws-lc-rs"))]
-#[macro_export]
-#[doc(hidden)]
-#[allow(clippy::crate_in_macro_def)]
-macro_rules! map_err {
-    ($result:expr) => {
-        $result.map_err(|e| crate::Error::from(e))
-    };
-}

russh/src/lib_inner.rs

@@ -40,6 +40,8 @@ pub use sshbuffer::SshId;
 
 mod helpers;
 
+pub(crate) use helpers::map_err;
+
 macro_rules! push_packet {
     ( $buffer:expr, $x:expr ) => {{
         use byteorder::{BigEndian, ByteOrder};