Merge pull request RustPython#1685 from youknowone/slot-name

youknowone · web-flow · commit d31d0c65106c · 2020-01-15T11:51:16.000+09:00
pyslot guess slot name from function name
diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -207,15 +207,25 @@ impl Class {
                 )?;
                 attr_idxs.push(i);
             } else if name == "pyslot" {
-                let pyslot_err = "#[pyslot] must be of the form #[pyslot(slotname)]";
+                let pyslot_err = "#[pyslot] must be of the form #[pyslot] or #[pyslot(slotname)]";
                 let nesteds =
                     meta_to_vec(meta).map_err(|meta| err_span!(meta, "{}", pyslot_err))?;
-                if nesteds.len() != 1 {
+                if nesteds.len() > 1 {
                     return Err(Diagnostic::spanned_error(&quote!(#(#nesteds)*), pyslot_err));
                 }
-                let slot_ident = match nesteds.into_iter().next().unwrap() {
-                    NestedMeta::Meta(Meta::Word(ident)) => ident,
-                    bad => bail_span!(bad, "{}", pyslot_err),
+                let slot_ident = if nesteds.is_empty() {
+                    let ident_str = sig.ident.to_string();
+                    if ident_str.starts_with("tp_") {
+                        let slot_name = &ident_str[3..];
+                        proc_macro2::Ident::new(slot_name, sig.ident.span())
+                    } else {
+                        sig.ident.clone()
+                    }
+                } else {
+                    match nesteds.into_iter().next().unwrap() {
+                        NestedMeta::Meta(Meta::Word(ident)) => ident,
+                        bad => bail_span!(bad, "{}", pyslot_err),
+                    }
                 };
                 self.add_item(
                     ClassItem::Slot {
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -55,7 +55,7 @@ impl PyBaseException {
         }
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, args: PyFuncArgs, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         PyBaseException::new(args.args, vm).into_ref_with_type(vm, cls)
     }
diff --git a/vm/src/obj/objbytearray.rs b/vm/src/obj/objbytearray.rs
@@ -89,7 +89,7 @@ pub(crate) fn init(context: &PyContext) {
 
 #[pyimpl]
 impl PyByteArray {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         options: ByteInnerNewOptions,
diff --git a/vm/src/obj/objbytes.rs b/vm/src/obj/objbytes.rs
@@ -91,7 +91,7 @@ pub(crate) fn init(context: &PyContext) {
 
 #[pyimpl]
 impl PyBytes {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         options: ByteInnerNewOptions,
diff --git a/vm/src/obj/objclassmethod.rs b/vm/src/obj/objclassmethod.rs
@@ -55,7 +55,7 @@ impl PyBuiltinDescriptor for PyClassMethod {
 
 #[pyimpl]
 impl PyClassMethod {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         callable: PyObjectRef,
diff --git a/vm/src/obj/objcomplex.rs b/vm/src/obj/objcomplex.rs
@@ -213,7 +213,7 @@ impl PyComplex {
         !Complex64::is_zero(&self.value)
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         real: OptionalArg<IntoPyFloat>,
diff --git a/vm/src/obj/objenumerate.rs b/vm/src/obj/objenumerate.rs
@@ -27,7 +27,7 @@ impl PyValue for PyEnumerate {
 
 #[pyimpl]
 impl PyEnumerate {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         iterable: PyObjectRef,
diff --git a/vm/src/obj/objfilter.rs b/vm/src/obj/objfilter.rs
@@ -25,7 +25,7 @@ impl PyValue for PyFilter {
 
 #[pyimpl]
 impl PyFilter {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         function: PyObjectRef,
diff --git a/vm/src/obj/objfloat.rs b/vm/src/obj/objfloat.rs
@@ -176,7 +176,7 @@ fn int_eq(value: f64, other: &BigInt) -> bool {
 #[pyimpl]
 #[allow(clippy::trivially_copy_pass_by_ref)]
 impl PyFloat {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         arg: OptionalArg<PyObjectRef>,
diff --git a/vm/src/obj/objframe.rs b/vm/src/obj/objframe.rs
@@ -14,7 +14,7 @@ pub fn init(context: &PyContext) {
 
 #[pyimpl]
 impl FrameRef {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(_cls: FrameRef, vm: &VirtualMachine) -> PyResult<Self> {
         Err(vm.new_type_error("Cannot directly create frame object".to_string()))
     }
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -213,7 +213,7 @@ fn inner_truediv(i1: &BigInt, i2: &BigInt, vm: &VirtualMachine) -> PyResult {
 
 #[pyimpl]
 impl PyInt {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, options: IntOptions, vm: &VirtualMachine) -> PyResult<PyIntRef> {
         PyInt::new(options.get_int_value(vm)?).into_ref_with_type(vm, cls)
     }
diff --git a/vm/src/obj/objlist.rs b/vm/src/obj/objlist.rs
@@ -762,8 +762,8 @@ impl PyList {
         Ok(())
     }
 
-    #[pyslot(new)]
-    fn list_new(
+    #[pyslot]
+    fn tp_new(
         cls: PyClassRef,
         iterable: OptionalArg<PyObjectRef>,
         vm: &VirtualMachine,
diff --git a/vm/src/obj/objmap.rs b/vm/src/obj/objmap.rs
@@ -24,7 +24,7 @@ impl PyValue for PyMap {
 
 #[pyimpl]
 impl PyMap {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         function: PyObjectRef,
diff --git a/vm/src/obj/objmappingproxy.rs b/vm/src/obj/objmappingproxy.rs
@@ -36,7 +36,7 @@ impl PyMappingProxy {
         }
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, mapping: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         PyMappingProxy {
             mapping: MappingProxyInner::Dict(mapping),
diff --git a/vm/src/obj/objmemory.rs b/vm/src/obj/objmemory.rs
@@ -20,7 +20,7 @@ impl PyMemoryView {
         try_as_byte(&self.obj_ref)
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         bytes_object: PyObjectRef,
diff --git a/vm/src/obj/objnamespace.rs b/vm/src/obj/objnamespace.rs
@@ -19,7 +19,7 @@ impl PyValue for PyNamespace {
 
 #[pyimpl]
 impl PyNamespace {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, kwargs: KwArgs, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         let zelf = PyNamespace.into_ref_with_type(vm, cls)?;
         for (name, value) in kwargs.into_iter() {
diff --git a/vm/src/obj/objnone.rs b/vm/src/obj/objnone.rs
@@ -37,7 +37,7 @@ impl<T: IntoPyObject> IntoPyObject for Option<T> {
 
 #[pyimpl]
 impl PyNone {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(_: PyClassRef, vm: &VirtualMachine) -> PyNoneRef {
         vm.ctx.none.clone()
     }
diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
@@ -131,7 +131,7 @@ impl PyBuiltinDescriptor for PyProperty {
 
 #[pyimpl]
 impl PyProperty {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, args: PropertyArgs, vm: &VirtualMachine) -> PyResult<PyPropertyRef> {
         PyProperty {
             getter: args.fget,
diff --git a/vm/src/obj/objrange.rs b/vm/src/obj/objrange.rs
@@ -384,7 +384,7 @@ impl PyRange {
         pyhash::hash_iter(elements.iter(), vm)
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(args: PyFuncArgs, vm: &VirtualMachine) -> PyResult {
         let range = if args.args.len() <= 2 {
             let (cls, stop) = args.bind(vm)?;
diff --git a/vm/src/obj/objset.rs b/vm/src/obj/objset.rs
@@ -330,7 +330,7 @@ macro_rules! try_set_cmp {
 
 #[pyimpl]
 impl PySet {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         iterable: OptionalArg<PyIterable>,
@@ -586,7 +586,7 @@ impl PySet {
 
 #[pyimpl]
 impl PyFrozenSet {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         iterable: OptionalArg<PyIterable>,
diff --git a/vm/src/obj/objslice.rs b/vm/src/obj/objslice.rs
@@ -88,7 +88,7 @@ impl PySlice {
         }
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, args: PyFuncArgs, vm: &VirtualMachine) -> PyResult<PySliceRef> {
         let slice: PySlice = match args.args.len() {
             0 => {
diff --git a/vm/src/obj/objstaticmethod.rs b/vm/src/obj/objstaticmethod.rs
@@ -30,7 +30,7 @@ impl PyBuiltinDescriptor for PyStaticMethod {
 
 #[pyimpl]
 impl PyStaticMethodRef {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         callable: PyObjectRef,
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -179,7 +179,7 @@ struct StrArgs {
 
 #[pyimpl]
 impl PyString {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, args: StrArgs, vm: &VirtualMachine) -> PyResult<PyStringRef> {
         let string: PyStringRef = match args.object {
             OptionalArg::Present(input) => {
diff --git a/vm/src/obj/objsuper.rs b/vm/src/obj/objsuper.rs
@@ -76,7 +76,7 @@ impl PySuper {
         }
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         py_type: OptionalArg<PyClassRef>,
diff --git a/vm/src/obj/objtuple.rs b/vm/src/obj/objtuple.rs
@@ -227,8 +227,8 @@ impl PyTuple {
         Ok(false)
     }
 
-    #[pyslot(new)]
-    fn tuple_new(
+    #[pyslot]
+    fn tp_new(
         cls: PyClassRef,
         iterable: OptionalArg<PyObjectRef>,
         vm: &VirtualMachine,
diff --git a/vm/src/obj/objweakproxy.rs b/vm/src/obj/objweakproxy.rs
@@ -21,7 +21,7 @@ pub type PyWeakProxyRef = PyRef<PyWeakProxy>;
 #[pyimpl]
 impl PyWeakProxy {
     // TODO: callbacks
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         referent: PyObjectRef,
diff --git a/vm/src/obj/objzip.rs b/vm/src/obj/objzip.rs
@@ -20,7 +20,7 @@ impl PyValue for PyZip {
 
 #[pyimpl]
 impl PyZip {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(cls: PyClassRef, iterables: Args, vm: &VirtualMachine) -> PyResult<PyZipRef> {
         let iterators = iterables
             .into_iter()
diff --git a/vm/src/stdlib/array.rs b/vm/src/stdlib/array.rs
@@ -190,7 +190,7 @@ impl PyValue for PyArray {
 
 #[pyimpl]
 impl PyArray {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         spec: PyStringRef,
diff --git a/vm/src/stdlib/collections.rs b/vm/src/stdlib/collections.rs
@@ -39,7 +39,7 @@ impl PyDeque {
 
 #[pyimpl]
 impl PyDeque {
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(
         cls: PyClassRef,
         iter: OptionalArg<PyIterable>,
diff --git a/vm/src/stdlib/hashlib.rs b/vm/src/stdlib/hashlib.rs
@@ -41,7 +41,7 @@ impl PyHasher {
         }
     }
 
-    #[pyslot(new)]
+    #[pyslot]
     fn tp_new(_cls: PyClassRef, _args: PyFuncArgs, vm: &VirtualMachine) -> PyResult {
         Ok(PyHasher::new("md5", HashWrapper::md5())
             .into_ref(vm)
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ impl PyBaseException {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- #[pyslot(new)]`
	`58`	`+ #[pyslot]`
`59`	`59`	`fn tp_new(cls: PyClassRef, args: PyFuncArgs, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {`
`60`	`60`	`PyBaseException::new(args.args, vm).into_ref_with_type(vm, cls)`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ impl PyComplex {`
`213`	`213`	`!Complex64::is_zero(&self.value)`
`214`	`214`	`}`
`215`	`215`
`216`		`- #[pyslot(new)]`
	`216`	`+ #[pyslot]`
`217`	`217`	`fn tp_new(`
`218`	`218`	`cls: PyClassRef,`
`219`	`219`	`real: OptionalArg<IntoPyFloat>,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ pub fn init(context: &PyContext) {`
`14`	`14`
`15`	`15`	`#[pyimpl]`
`16`	`16`	`impl FrameRef {`
`17`		`- #[pyslot(new)]`
	`17`	`+ #[pyslot]`
`18`	`18`	`fn tp_new(_cls: FrameRef, vm: &VirtualMachine) -> PyResult<Self> {`
`19`	`19`	`Err(vm.new_type_error("Cannot directly create frame object".to_string()))`
`20`	`20`	`}`