Skip to content

Commit f22a12d

Browse files
youknowoneyouknowone
authored
Merge pull request RustPython#1647 from youknowone/property-setter
Allow empty return type for property setter
2 parents 3aa09dd + a54c98d commit f22a12d

5 files changed

Lines changed: 30 additions & 20 deletions

File tree

‎vm/src/exceptions.rs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ impl PyBaseException {
7272
}
7373

7474
#[pyproperty(setter)]
75-
fn set_args(&self, args: PyIterable, vm: &VirtualMachine) -> PyResult {
75+
fn set_args(&self, args: PyIterable, vm: &VirtualMachine) -> PyResult<()> {
7676
let args = args.iter(vm)?.collect::<PyResult<Vec<_>>>()?;
7777
self.args.replace(PyTuple::from(args).into_ref(vm));
78-
Ok(vm.get_none())
78+
Ok(())
7979
}
8080

8181
#[pyproperty(name = "__traceback__")]
@@ -84,9 +84,8 @@ impl PyBaseException {
8484
}
8585

8686
#[pyproperty(name = "__traceback__", setter)]
87-
fn set_traceback(&self, traceback: Option<PyTracebackRef>, vm: &VirtualMachine) -> PyResult {
87+
fn set_traceback(&self, traceback: Option<PyTracebackRef>, _vm: &VirtualMachine) {
8888
self.traceback.replace(traceback);
89-
Ok(vm.get_none())
9089
}
9190

9291
#[pyproperty(name = "__cause__")]
@@ -95,9 +94,8 @@ impl PyBaseException {
9594
}
9695

9796
#[pyproperty(name = "__cause__", setter)]
98-
fn set_cause(&self, cause: Option<PyObjectRef>, vm: &VirtualMachine) -> PyResult {
97+
fn set_cause(&self, cause: Option<PyObjectRef>, _vm: &VirtualMachine) {
9998
self.cause.replace(cause);
100-
Ok(vm.get_none())
10199
}
102100

103101
#[pyproperty(name = "__context__")]
@@ -106,9 +104,8 @@ impl PyBaseException {
106104
}
107105

108106
#[pyproperty(name = "__context__", setter)]
109-
fn set_context(&self, context: Option<PyObjectRef>, vm: &VirtualMachine) -> PyResult {
107+
fn set_context(&self, context: Option<PyObjectRef>, _vm: &VirtualMachine) {
110108
self.context.replace(context);
111-
Ok(vm.get_none())
112109
}
113110

114111
#[pyproperty(name = "__suppress_context__")]
@@ -117,9 +114,8 @@ impl PyBaseException {
117114
}
118115

119116
#[pyproperty(name = "__suppress_context__", setter)]
120-
fn set_suppress_context(&self, suppress_context: bool, vm: &VirtualMachine) -> PyResult {
117+
fn set_suppress_context(&self, suppress_context: bool, _vm: &VirtualMachine) {
121118
self.suppress_context.set(suppress_context);
122-
Ok(vm.get_none())
123119
}
124120

125121
#[pymethod]

‎vm/src/obj/objobject.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ fn object_class_setter(
203203
instance: PyObjectRef,
204204
_value: PyObjectRef,
205205
vm: &VirtualMachine,
206-
) -> PyResult {
206+
) -> PyResult<()> {
207207
let type_repr = vm.to_pystr(&instance.class())?;
208208
Err(vm.new_type_error(format!("can't change class of type '{}'", type_repr)))
209209
}
@@ -216,10 +216,14 @@ fn object_dict(object: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyDictRef>
216216
}
217217
}
218218

219-
fn object_dict_setter(instance: PyObjectRef, value: PyDictRef, vm: &VirtualMachine) -> PyResult {
219+
fn object_dict_setter(
220+
instance: PyObjectRef,
221+
value: PyDictRef,
222+
vm: &VirtualMachine,
223+
) -> PyResult<()> {
220224
if let Some(dict) = &instance.dict {
221225
*dict.borrow_mut() = value;
222-
Ok(vm.get_none())
226+
Ok(())
223227
} else {
224228
Err(vm.new_attribute_error(format!(
225229
"'{}' object has no attribute '__dict__'",

‎vm/src/obj/objproperty.rs‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,8 @@ impl PyProperty {
184184
self.doc.borrow().clone()
185185
}
186186

187-
fn doc_setter(&self, value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
187+
fn doc_setter(&self, value: PyObjectRef, vm: &VirtualMachine) {
188188
self.doc.replace(py_none_to_option(vm, &value));
189-
Ok(vm.get_none())
190189
}
191190

192191
// Python builder functions
@@ -252,6 +251,11 @@ pub struct PropertyBuilder<'a> {
252251
setter: Option<PyObjectRef>,
253252
}
254253

254+
pub trait PropertySetterResult {}
255+
256+
impl PropertySetterResult for PyResult<()> {}
257+
impl PropertySetterResult for () {}
258+
255259
impl<'a> PropertyBuilder<'a> {
256260
pub fn new(ctx: &'a PyContext) -> Self {
257261
Self {
@@ -270,7 +274,10 @@ impl<'a> PropertyBuilder<'a> {
270274
}
271275
}
272276

273-
pub fn add_setter<I, V, F: IntoPyNativeFunc<(I, V), PyResult>>(self, func: F) -> Self {
277+
pub fn add_setter<I, V, F: IntoPyNativeFunc<(I, V), impl PropertySetterResult>>(
278+
self,
279+
func: F,
280+
) -> Self {
274281
let func = self.ctx.new_rustfunc(func);
275282
Self {
276283
ctx: self.ctx,

‎vm/src/obj/objtype.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl PyClassRef {
9090
PyTuple::from(elements)
9191
}
9292

93-
fn set_mro(self, _value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
93+
fn set_mro(self, _value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
9494
Err(vm.new_attribute_error("read-only attribute".to_string()))
9595
}
9696

@@ -393,7 +393,11 @@ fn type_dict(class: PyClassRef, _vm: &VirtualMachine) -> PyMappingProxy {
393393
PyMappingProxy::new(class)
394394
}
395395

396-
fn type_dict_setter(_instance: PyClassRef, _value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
396+
fn type_dict_setter(
397+
_instance: PyClassRef,
398+
_value: PyObjectRef,
399+
vm: &VirtualMachine,
400+
) -> PyResult<()> {
397401
Err(vm.new_not_implemented_error(
398402
"Setting __dict__ attribute on a type isn't yet implemented".to_string(),
399403
))

‎vm/src/stdlib/collections.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,8 @@ impl PyDeque {
202202
self.maxlen.get()
203203
}
204204
#[pyproperty(setter)]
205-
fn set_maxlen(&self, maxlen: Option<usize>, vm: &VirtualMachine) -> PyResult {
205+
fn set_maxlen(&self, maxlen: Option<usize>, _vm: &VirtualMachine) {
206206
self.maxlen.set(maxlen);
207-
Ok(vm.get_none())
208207
}
209208

210209
#[pymethod(name = "__repr__")]

0 commit comments

Comments
 (0)