From d2ac641c3f2fb8f6f189d3650fed25063049c80b Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Wed, 21 Oct 2020 20:24:06 +0200
Subject: [PATCH] Hide lock type better to not collide with user types

---
 macros/src/codegen/util.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macros/src/codegen/util.rs b/macros/src/codegen/util.rs
index 887ee3bdfc..d78da61d13 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;