Merge pull request RustPython#3759 from youknowone/pyimpl

pyimpl -> pyclass

Author: youknowone

derive/src/lib.rs

@@ -45,7 +45,11 @@ pub fn pyclass(
 ) -> proc_macro::TokenStream {
     let attr = parse_macro_input!(attr as AttributeArgs);
     let item = parse_macro_input!(item as Item);
-    result_to_tokens(pyclass::impl_pyclass(attr, item))
+    if matches!(item, syn::Item::Impl(_) | syn::Item::Trait(_)) {
+        result_to_tokens(pyclass::impl_pyimpl(attr, item))
+    } else {
+        result_to_tokens(pyclass::impl_pyclass(attr, item))
+    }
 }
 
 /// This macro serves a goal of generating multiple
@@ -76,16 +80,6 @@ pub fn pyexception(
     result_to_tokens(pyclass::impl_pyexception(attr, item))
 }
 
-#[proc_macro_attribute]
-pub fn pyimpl(
-    attr: proc_macro::TokenStream,
-    item: proc_macro::TokenStream,
-) -> proc_macro::TokenStream {
-    let attr = parse_macro_input!(attr as AttributeArgs);
-    let item = parse_macro_input!(item as Item);
-    result_to_tokens(pyclass::impl_pyimpl(attr, item))
-}
-
 #[proc_macro_attribute]
 pub fn pymodule(
     attr: proc_macro::TokenStream,

derive/src/pyclass.rs

@@ -373,7 +373,7 @@ pub(crate) fn impl_define_exception(exc_def: PyExceptionDef) -> Result<TokenStre
             }
         }
 
-        #[pyimpl(flags(BASETYPE, HAS_DICT))]
+        #[pyclass(flags(BASETYPE, HAS_DICT))]
         impl #class_name {
             #[pyslot]
             pub(crate) fn slot_new(
@@ -959,7 +959,7 @@ fn extract_impl_attrs(attr: AttributeArgs, item: &Ident) -> Result<ExtractedImpl
                         let path = match meta {
                             NestedMeta::Meta(Meta::Path(path)) => path,
                             meta => {
-                                bail_span!(meta, "#[pyimpl(with(...))] arguments should be paths")
+                                bail_span!(meta, "#[pyclass(with(...))] arguments should be paths")
                             }
                         };
                         let (extend_class, extend_slots) = if path_eq(&path, "PyRef") {
@@ -993,12 +993,12 @@ fn extract_impl_attrs(attr: AttributeArgs, item: &Ident) -> Result<ExtractedImpl
                                 } else {
                                     bail_span!(
                                         path,
-                                        "#[pyimpl(flags(...))] arguments should be ident"
+                                        "#[pyclass(flags(...))] arguments should be ident"
                                     )
                                 }
                             }
                             meta => {
-                                bail_span!(meta, "#[pyimpl(flags(...))] arguments should be ident")
+                                bail_span!(meta, "#[pyclass(flags(...))] arguments should be ident")
                             }
                         }
                     }
@@ -1098,7 +1098,7 @@ where
                 if ALL_ALLOWED_NAMES.contains(&attr_name.as_str()) {
                     return Err(syn::Error::new_spanned(
                         attr,
-                        format!("#[pyimpl] doesn't accept #[{}]", wrong_name),
+                        format!("#[pyclass] doesn't accept #[{}]", wrong_name),
                     ));
                 } else {
                     continue;

derive/src/pymodule.rs

@@ -69,6 +69,10 @@ pub fn impl_pymodule(attr: AttributeArgs, module_item: Item) -> Result<TokenStre
 
     // collect to context
     for item in items.iter_mut() {
+        if matches!(item, Item::Impl(_) | Item::Trait(_)) {
+            // #[pyclass] implementations
+            continue;
+        }
         let r = item.try_split_attr_mut(|attrs, item| {
             let (pyitems, cfgs) = attrs_to_module_items(attrs, module_item_new)?;
             for pyitem in pyitems.iter().rev() {

stdlib/src/array.rs

@@ -673,7 +673,7 @@ mod array {
         }
     }
 
-    #[pyimpl(
+    #[pyclass(
         flags(BASETYPE),
         with(Comparable, AsBuffer, AsMapping, Iterable, Constructor)
     )]
@@ -1293,7 +1293,7 @@ mod array {
         internal: PyMutex<PositionIterInternal<PyArrayRef>>,
     }
 
-    #[pyimpl(with(IterNext), flags(HAS_DICT))]
+    #[pyclass(with(IterNext), flags(HAS_DICT))]
     impl PyArrayIter {
         #[pymethod(magic)]
         fn setstate(&self, state: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {

stdlib/src/contextvars.rs

@@ -14,7 +14,7 @@ mod _contextvars {
     #[derive(Debug, PyPayload)]
     struct PyContext {} // not to confuse with vm::Context
 
-    #[pyimpl(with(Initializer))]
+    #[pyclass(with(Initializer))]
     impl PyContext {
         #[pymethod]
         fn run(
@@ -99,7 +99,7 @@ mod _contextvars {
         default: OptionalArg<PyObjectRef>,
     }
 
-    #[pyimpl(with(Initializer))]
+    #[pyclass(with(Initializer))]
     impl ContextVar {
         #[pyproperty]
         fn name(&self) -> String {
@@ -172,7 +172,7 @@ mod _contextvars {
         old_value: PyObjectRef,
     }
 
-    #[pyimpl(with(Initializer))]
+    #[pyclass(with(Initializer))]
     impl ContextToken {
         #[pyproperty]
         fn var(&self, _vm: &VirtualMachine) -> PyObjectRef {

stdlib/src/csv.rs

@@ -165,7 +165,7 @@ mod _csv {
         }
     }
 
-    #[pyimpl(with(IterNext))]
+    #[pyclass(with(IterNext))]
     impl Reader {}
     impl IterNextIterable for Reader {}
     impl IterNext for Reader {
@@ -255,7 +255,7 @@ mod _csv {
         }
     }
 
-    #[pyimpl]
+    #[pyclass]
     impl Writer {
         #[pymethod]
         fn writerow(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult {

stdlib/src/grp.rs

@@ -21,7 +21,7 @@ mod grp {
         gr_gid: u32,
         gr_mem: PyListRef,
     }
-    #[pyimpl(with(PyStructSequence))]
+    #[pyclass(with(PyStructSequence))]
     impl Group {
         fn from_unistd_group(group: unistd::Group, vm: &VirtualMachine) -> Self {
             let cstr_lossy = |s: std::ffi::CString| {

stdlib/src/hashlib.rs

@@ -58,7 +58,7 @@ mod hashlib {
         }
     }
 
-    #[pyimpl]
+    #[pyclass]
     impl PyHasher {
         fn new(name: &str, d: HashWrapper) -> Self {
             PyHasher {

stdlib/src/json.rs

@@ -64,7 +64,7 @@ mod _json {
         }
     }
 
-    #[pyimpl(with(Callable, Constructor))]
+    #[pyclass(with(Callable, Constructor))]
     impl JsonScanner {
         fn parse(
             &self,

stdlib/src/mmap.rs

@@ -458,7 +458,7 @@ mod mmap {
         };
     }
 
-    #[pyimpl(with(Constructor, AsMapping, AsSequence, AsBuffer), flags(BASETYPE))]
+    #[pyclass(with(Constructor, AsMapping, AsSequence, AsBuffer), flags(BASETYPE))]
     impl PyMmap {
         fn as_bytes_mut(&self) -> BorrowedValueMut<[u8]> {
             PyMutexGuard::map(self.mmap.lock(), |m| {