Skip to content

Remove type parameter from PropertyBuilder #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2019
Merged

Remove type parameter from PropertyBuilder #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions vm/src/obj/objproperty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

*/

use std::marker::PhantomData;

use crate::obj::objstr::PyStringRef;
use crate::obj::objtype::PyClassRef;
use crate::pyobject::{
Expand Down Expand Up @@ -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,
}
}

Expand All @@ -125,7 +120,6 @@ impl<'a, T> PropertyBuilder<'a, T> {
ctx: self.ctx,
getter: self.getter,
setter: Some(func),
_return: PhantomData,
}
}

Expand Down
4 changes: 2 additions & 2 deletions vm/src/pyobject.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down