Remove ref and readonly from generated code

robotdotnet · Feb 22, 2024 · 97b434c · 97b434c
1 parent e273f5e
commit 97b434c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/codehelp/CodeHelpers/TypeDeclarationModel.cs b/codehelp/CodeHelpers/TypeDeclarationModel.cs
@@ -16,8 +16,6 @@ public record TypeDeclarationModel(TypeKind Kind, TypeModifiers Modifiers, strin
 {
     private string GetClassDeclaration(bool addUnsafe)
     {
-        string readonlyString = (Modifiers & TypeModifiers.IsReadOnly) != 0 ? "readonly " : "";
-        string refString = (Modifiers & TypeModifiers.IsRefLikeType) != 0 ? "ref " : "";
         string recordString = (Modifiers & TypeModifiers.IsRecord) != 0 ? "record " : "";
         string unsafeString = addUnsafe ? "unsafe " : "";
 #pragma warning disable CS8509 // The switch expression does not handle all possible values of its input type (it is not exhaustive).
@@ -29,7 +27,7 @@ private string GetClassDeclaration(bool addUnsafe)
         };
 #pragma warning restore CS8509 // The switch expression does not handle all possible values of its input type (it is not exhaustive).
 
-        return $"{unsafeString}{readonlyString}{refString}partial {recordString}{kindString}";
+        return $"{unsafeString}partial {recordString}{kindString}";
     }
 
     private void GetGenericParameters(IndentedStringBuilder builder)

diff --git a/src/wpilibsharp/DataLogManager.cs b/src/wpilibsharp/DataLogManager.cs
@@ -19,7 +19,6 @@ public static class DataLogManger
     private static NtConnectionDataLogger m_ntConnLogger;
     private static StringLogEntry? m_messageLog;
     private static readonly object m_lockObject = new();
-    private static volatile int m_runThread = 1;
 
     // if less than this much free space, delete log files until there is this much free space
     // OR there are this many files remaining.

diff --git a/src/wpiutil/Concurrent/RefEvent.cs b/src/wpiutil/Concurrent/RefEvent.cs
@@ -1,14 +1,15 @@
+using WPIUtil.Handles;
 using WPIUtil.Natives;
 
 namespace WPIUtil.Concurrent;
 
 public readonly ref struct RefEvent
 {
-    public int Handle { get; }
+    public WpiEventHandle Handle { get; }
 
     public readonly void Dispose()
     {
-        if (Handle != 0)
+        if (Handle.Handle != 0)
         {
             SynchronizationNative.DestroyEvent(Handle);
         }

diff --git a/src/wpiutil/EventVector.cs b/src/wpiutil/EventVector.cs
@@ -1,3 +1,4 @@
+using WPIUtil.Handles;
 using WPIUtil.Natives;
 
 namespace WPIUtil;
@@ -29,7 +30,7 @@ public void Wakeup()
         {
             foreach (int handle in m_events)
             {
-                SynchronizationNative.SetEvent(handle);
+                SynchronizationNative.SetEvent(new WpiEventHandle(handle));
             }
         }
     }