Fixed a merge error, minor code refactoring

Author: Sergio0694

Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs

@@ -130,7 +130,11 @@ public void Clear()
             this.entries = InitialEntries;
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Checks whether or not the dictionary contains a pair with a specified key.
+        /// </summary>
+        /// <param name="key">The key to look for.</param>
+        /// <returns>Whether or not the key was present in the dictionary.</returns>
         public bool ContainsKey(TKey key)
         {
             Entry[] entries = this.entries;
@@ -176,7 +180,18 @@ public bool TryGetValue(TKey key, out TValue? value)
         }
 
         /// <inheritdoc/>
-        public bool TryRemove(TKey key, out object? result)
+        public bool TryRemove(TKey key)
+        {
+            return TryRemove(key, out _);
+        }
+
+        /// <summary>
+        /// Tries to remove a value with a specified key, if present.
+        /// </summary>
+        /// <param name="key">The key of the value to remove.</param>
+        /// <param name="result">The removed value, if it was present.</param>
+        /// <returns>Whether or not the key was present.</returns>
+        public bool TryRemove(TKey key, out TValue? result)
         {
             Entry[] entries = this.entries;
             int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);

Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs

@@ -13,19 +13,11 @@ namespace Microsoft.Collections.Extensions
     internal interface IDictionarySlim<in TKey> : IDictionarySlim
         where TKey : IEquatable<TKey>
     {
-        /// <summary>
-        /// Checks whether or not the dictionary contains a pair with a specified key.
-        /// </summary>
-        /// <param name="key">The key to look for.</param>
-        /// <returns>Whether or not the key was present in the dictionary.</returns>
-        public bool ContainsKey(TKey key);
-
         /// <summary>
         /// Tries to remove a value with a specified key, if present.
         /// </summary>
         /// <param name="key">The key of the value to remove.</param>
-        /// <param name="result">The removed value, if it was present.</param>
         /// <returns>Whether or not the key was present.</returns>
-        bool TryRemove(TKey key, out object? result);
+        bool TryRemove(TKey key);
     }
 }

Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs

@@ -157,7 +157,7 @@ public void UnregisterAll(object recipient)
                 // Removes all the lists of registered handlers for the recipient
                 foreach (IMapping mapping in set!)
                 {
-                    if (mapping.TryRemove(key, out _))
+                    if (mapping.TryRemove(key))
                     {
                         if (mapping.Count == 0)
                         {
@@ -243,11 +243,11 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
 
                     // Try to remove the registered handler for the input token,
                     // for the current message type (unknown from here).
-                    if (holder.TryRemove(token, out _) &&
+                    if (holder.TryRemove(token) &&
                         holder.Count == 0)
                     {
                         // If the map is empty, remove the recipient entirely from its container
-                        map.TryRemove(key, out _);
+                        map.TryRemove(key);
 
                         if (map.Count == 0)
                         {

Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs

@@ -65,7 +65,7 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
                 return
                     this.recipientsMap.TryGetValue(type2, out ConditionalWeakTable<object, IDictionarySlim>? table) &&
                     table!.TryGetValue(recipient, out IDictionarySlim mapping) &&
-                    Unsafe.As<IDictionarySlim<TToken>>(mapping).ContainsKey(token);
+                    Unsafe.As<DictionarySlim<TToken, object>>(mapping).ContainsKey(token);
             }
         }
 
@@ -133,7 +133,7 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                     if (enumerator.Key.TToken == typeof(TToken) &&
                         enumerator.Value.TryGetValue(recipient, out IDictionarySlim mapping))
                     {
-                        Unsafe.As<IDictionarySlim<TToken>>(mapping).TryRemove(token, out _);
+                        Unsafe.As<DictionarySlim<TToken, object>>(mapping).TryRemove(token, out _);
                     }
                 }
             }
@@ -156,7 +156,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                     if (enumerator.Key.Equals(type2) &&
                         enumerator.Value.TryGetValue(recipient, out IDictionarySlim mapping))
                     {
-                        Unsafe.As<IDictionarySlim<TToken>>(mapping).TryRemove(token, out _);
+                        Unsafe.As<DictionarySlim<TToken, object>>(mapping).TryRemove(token, out _);
                     }
                 }
             }
@@ -275,7 +275,7 @@ void IMessenger.Cleanup()
                 // Remove all the mappings with no handlers left
                 foreach (Type2 key in type2s.Span)
                 {
-                    this.recipientsMap.Remove(key);
+                    this.recipientsMap.TryRemove(key, out _);
                 }
             }
         }