From 067fc0927d2e6447a05c1e8ca2b19ff2feb2e1a2 Mon Sep 17 00:00:00 2001
From: ben <benlewisj@gmail.com>
Date: Thu, 14 Mar 2019 07:24:49 +1300
Subject: [PATCH] Remove type parameter from PropertyBuilder

---
 vm/src/obj/objproperty.rs | 12 +++---------
 vm/src/pyobject.rs        |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
index c44a4350bc..7cb4ea8498 100644
--- a/vm/src/obj/objproperty.rs
+++ b/vm/src/obj/objproperty.rs
@@ -2,8 +2,6 @@
 
 */
 
-use std::marker::PhantomData;
-
 use crate::obj::objstr::PyStringRef;
 use crate::obj::objtype::PyClassRef;
 use crate::pyobject::{
@@ -92,30 +90,27 @@ impl PyPropertyRef {
     }
 }
 
-pub struct PropertyBuilder<'a, T> {
+pub struct PropertyBuilder<'a> {
     ctx: &'a PyContext,
     getter: Option<PyObjectRef>,
     setter: Option<PyObjectRef>,
-    _return: PhantomData<T>,
 }
 
-impl<'a, T> PropertyBuilder<'a, T> {
+impl<'a> PropertyBuilder<'a> {
     pub fn new(ctx: &'a PyContext) -> Self {
         Self {
             ctx,
             getter: None,
             setter: None,
-            _return: PhantomData,
         }
     }
 
-    pub fn add_getter<I, F: IntoPyNativeFunc<I, T>>(self, func: F) -> Self {
+    pub fn add_getter<I, V, F: IntoPyNativeFunc<I, V>>(self, func: F) -> Self {
         let func = self.ctx.new_rustfunc(func);
         Self {
             ctx: self.ctx,
             getter: Some(func),
             setter: self.setter,
-            _return: PhantomData,
         }
     }
 
@@ -125,7 +120,6 @@ impl<'a, T> PropertyBuilder<'a, T> {
             ctx: self.ctx,
             getter: self.getter,
             setter: Some(func),
-            _return: PhantomData,
         }
     }
 
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
index 0535779487..d23c68b665 100644
--- a/vm/src/pyobject.rs
+++ b/vm/src/pyobject.rs
@@ -596,9 +596,9 @@ impl PyContext {
         PyObject::new(Frame::new(code, scope), self.frame_type())
     }
 
-    pub fn new_property<F, T, R>(&self, f: F) -> PyObjectRef
+    pub fn new_property<F, I, V>(&self, f: F) -> PyObjectRef
     where
-        F: IntoPyNativeFunc<T, R>,
+        F: IntoPyNativeFunc<I, V>,
     {
         PropertyBuilder::new(self).add_getter(f).create()
     }