so much lint

OpenDreamProject · Dec 11, 2024 · f03a935 · f03a935
1 parent fba2601
commit f03a935
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/OpenDreamRuntime/Objects/DreamObject.cs b/OpenDreamRuntime/Objects/DreamObject.cs
@@ -91,8 +91,8 @@ public DreamObject(DreamObjectDefinition objectDefinition) {
                 ObjectDefinition.DreamManager.Datums.AddLast(new WeakDreamRef(this));
             }
             #if TOOLS
-            if(_tracyMemoryId is null) //if it's not null, subclasses have done their own allocation
-                _tracyMemoryId = Profiler.BeginMemoryZone((ulong)(Unsafe.SizeOf<DreamObject>() + ObjectDefinition.Variables.Count * Unsafe.SizeOf<DreamValue>() ), "/datum");
+             //if it's not null, subclasses have done their own allocation
+            _tracyMemoryId ??= Profiler.BeginMemoryZone((ulong)(Unsafe.SizeOf<DreamObject>() + ObjectDefinition.Variables.Count * Unsafe.SizeOf<DreamValue>() ), "/datum");
             #endif
         }
 

diff --git a/OpenDreamRuntime/Profile.cs b/OpenDreamRuntime/Profile.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using bottlenoselabs.C2CS.Runtime;
 using static Tracy.PInvoke;
@@ -8,7 +7,7 @@ namespace OpenDreamRuntime;
 
 public static class Profiler{
     //internal tracking for unique IDs for memory zones, because we can't use actual object pointers sadly as they are unstable outside of `unsafe`
-    private static UInt64 _memoryUID = 0;
+    private static ulong _memoryUid;
 
     // Plot names need to be cached for the lifetime of the program
     // seealso Tracy docs section 3.1
@@ -73,7 +72,7 @@ public static class Profiler{
         #else
         var namestr = name is null ? GetPlotCString("null") : GetPlotCString(name);
         unsafe {
-            return new ProfilerMemory((void*)(Interlocked.Add(ref _memoryUID, size)-size), size, namestr);
+            return new ProfilerMemory((void*)(Interlocked.Add(ref _memoryUid, size)-size), size, namestr);
         }
         #endif
     }