Merge #396

396: Fix namespaces r=AfoHT a=korken89



Co-authored-by: Emil Fresk <emil.fresk@gmail.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/macros/src/codegen/util.rs b/macros/src/codegen/util.rs
index bc8bfb8d..0625e49d 100644
--- a/macros/src/codegen/util.rs
+++ b/macros/src/codegen/util.rs
@@ -53,7 +53,7 @@ pub fn impl_mutex(
             type T = #ty;
 
             #[inline(always)]
-            fn lock<R>(&mut self, f: impl FnOnce(&mut #ty) -> R) -> R {
+            fn lock<RTIC_INTERNAL_R>(&mut self, f: impl FnOnce(&mut #ty) -> RTIC_INTERNAL_R) -> RTIC_INTERNAL_R {
                 /// Priority ceiling
                 const CEILING: u8 = #ceiling;
 
@@ -111,6 +111,14 @@ pub fn late_resources_ident(init: &Ident) -> Ident {
     )
 }
 
+/// Mangle an ident
+pub fn mangle_ident(ident: &Ident) -> Ident {
+    Ident::new(
+        &format!("__rtic_internal_{}", ident.to_string()),
+        Span::call_site(),
+    )
+}
+
 fn link_section_index() -> usize {
     static INDEX: AtomicUsize = AtomicUsize::new(0);