fixup! More changes to use BorrowedReference and NewReference

BadSingleton · BadSingleton · commit d5fcfa4fc4ae · 2020-09-24T16:10:51.000-04:00
diff --git a/src/runtime/BorrowedReference.cs b/src/runtime/BorrowedReference.cs
@@ -10,7 +10,6 @@ readonly ref struct BorrowedReference
         readonly IntPtr pointer;
         public bool IsNull => this.pointer == IntPtr.Zero;
 
-        public static implicit operator IntPtr(in BorrowedReference self) => self.DangerousGetAddress();
 
         /// <summary>Gets a raw pointer to the Python object</summary>
         public IntPtr DangerousGetAddress()
diff --git a/src/runtime/NewReference.cs b/src/runtime/NewReference.cs
@@ -15,10 +15,6 @@ ref struct NewReference
         public static implicit operator BorrowedReference(in NewReference reference)
             => new BorrowedReference(reference.pointer);
 
-        [Pure]
-        public static implicit operator IntPtr(in NewReference reference)
-            => DangerousGetAddress(reference);
-
         /// <summary>
         /// Returns <see cref="PyObject"/> wrapper around this reference, which now owns
         /// the pointer. Sets the original reference to <c>null</c>, as it no longer owns it.
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -748,22 +748,6 @@ internal static IntPtr SelfIncRef(IntPtr op)
             return op;
         }
 
-        /// <remark>
-        /// We need this method because BorrowedReference can be implicitly casted to IntPtr.
-        /// </remark>
-        internal static void XDecref(BorrowedReference op)
-        {
-            throw new InvalidOperationException("Cannot DecRef a borrowed reference.");
-        }
-
-        /// <remark>
-        /// We need this method because NewReference can be implicitly casted to IntPtr.
-        /// </remark>
-        internal static void XDecref(NewReference op)
-        {
-            op.Dispose();
-        }
-
         internal static unsafe void XDecref(IntPtr op)
         {
 #if PYTHON_WITH_PYDEBUG || NETSTANDARD
@@ -2148,10 +2132,10 @@ internal static void Py_CLEAR(ref IntPtr ob)
         internal static extern NewReference PyCapsule_New(IntPtr pointer, string name, IntPtr destructor);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern IntPtr PyCapsule_GetPointer(IntPtr capsule, string name);
+        internal static extern IntPtr PyCapsule_GetPointer(BorrowedReference capsule, string name);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyCapsule_SetPointer(IntPtr capsule, IntPtr pointer);
+        internal static extern int PyCapsule_SetPointer(BorrowedReference capsule, IntPtr pointer);
 
         //====================================================================
         // Miscellaneous
