Use MemberNotNullWhen to remove workaround for isLeased

ppy · May 27, 2023 · db7c54a · db7c54a
1 parent 0045365
commit db7c54a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/osu.Framework/Bindables/Bindable.cs b/osu.Framework/Bindables/Bindable.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using JetBrains.Annotations;
@@ -371,9 +372,8 @@ public void UnbindBindings()
 
         internal virtual void UnbindAllInternal()
         {
-            // TODO: annotate isLeased with [MemberNotNull(nameof(leasedBindable))] on .NET 5+ to satisfy the nullability check
             if (isLeased)
-                leasedBindable.AsNonNull().Return();
+                leasedBindable.Return();
 
             UnbindEvents();
             UnbindBindings();
@@ -430,6 +430,7 @@ void ISerializableBindable.DeserializeFrom(JsonReader reader, JsonSerializer ser
 
         private LeasedBindable<T>? leasedBindable;
 
+        [MemberNotNullWhen(true, nameof(leasedBindable))]
         private bool isLeased => leasedBindable != null;
 
         /// <summary>