Fix merge conflict
This commit is contained in:
parent
fb689340b4
commit
1b9763fef2
|
@ -42,7 +42,7 @@ pub struct KeywordAttribute<K, V> {
|
|||
pub struct LitStrValue<T>(pub T);
|
||||
|
||||
impl<T: Parse> Parse for LitStrValue<T> {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
fn parse(input: ParseStream<'_>) -> Result<Self> {
|
||||
let lit_str: LitStr = input.parse()?;
|
||||
lit_str.parse().map(LitStrValue)
|
||||
}
|
||||
|
@ -59,7 +59,7 @@ impl<T: ToTokens> ToTokens for LitStrValue<T> {
|
|||
pub struct NameLitStr(pub Ident);
|
||||
|
||||
impl Parse for NameLitStr {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
fn parse(input: ParseStream<'_>) -> Result<Self> {
|
||||
let string_literal: LitStr = input.parse()?;
|
||||
if let Ok(ident) = string_literal.parse() {
|
||||
Ok(NameLitStr(ident))
|
||||
|
@ -82,7 +82,7 @@ pub type NameAttribute = KeywordAttribute<kw::name, NameLitStr>;
|
|||
pub type TextSignatureAttribute = KeywordAttribute<kw::text_signature, LitStr>;
|
||||
|
||||
impl<K: Parse + std::fmt::Debug, V: Parse> Parse for KeywordAttribute<K, V> {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
fn parse(input: ParseStream<'_>) -> Result<Self> {
|
||||
let kw: K = input.parse()?;
|
||||
let _: Token![=] = input.parse()?;
|
||||
let value = input.parse()?;
|
||||
|
|
|
@ -31,7 +31,7 @@ pub struct PyClassArgs {
|
|||
}
|
||||
|
||||
impl PyClassArgs {
|
||||
fn parse(input: ParseStream, kind: PyClassKind) -> Result<Self> {
|
||||
fn parse(input: ParseStream<'_>, kind: PyClassKind) -> Result<Self> {
|
||||
Ok(PyClassArgs {
|
||||
class_kind: kind,
|
||||
options: PyClassPyO3Options::parse(input)?,
|
||||
|
@ -39,11 +39,11 @@ impl PyClassArgs {
|
|||
})
|
||||
}
|
||||
|
||||
pub fn parse_stuct_args(input: ParseStream) -> syn::Result<Self> {
|
||||
pub fn parse_stuct_args(input: ParseStream<'_>) -> syn::Result<Self> {
|
||||
Self::parse(input, PyClassKind::Struct)
|
||||
}
|
||||
|
||||
pub fn parse_enum_args(input: ParseStream) -> syn::Result<Self> {
|
||||
pub fn parse_enum_args(input: ParseStream<'_>) -> syn::Result<Self> {
|
||||
Self::parse(input, PyClassKind::Enum)
|
||||
}
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ enum PyClassPyO3Option {
|
|||
}
|
||||
|
||||
impl Parse for PyClassPyO3Option {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
fn parse(input: ParseStream<'_>) -> Result<Self> {
|
||||
let lookahead = input.lookahead1();
|
||||
if lookahead.peek(Token![crate]) {
|
||||
input.parse().map(PyClassPyO3Option::Crate)
|
||||
|
@ -111,7 +111,7 @@ impl Parse for PyClassPyO3Option {
|
|||
}
|
||||
|
||||
impl PyClassPyO3Options {
|
||||
fn parse(input: ParseStream) -> syn::Result<Self> {
|
||||
fn parse(input: ParseStream<'_>) -> syn::Result<Self> {
|
||||
let mut options: PyClassPyO3Options = Default::default();
|
||||
|
||||
for option in Punctuated::<PyClassPyO3Option, syn::Token![,]>::parse_terminated(input)? {
|
||||
|
@ -220,7 +220,7 @@ enum FieldPyO3Option {
|
|||
}
|
||||
|
||||
impl Parse for FieldPyO3Option {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
fn parse(input: ParseStream<'_>) -> Result<Self> {
|
||||
let lookahead = input.lookahead1();
|
||||
if lookahead.peek(attributes::kw::get) {
|
||||
input.parse().map(FieldPyO3Option::Get)
|
||||
|
@ -391,7 +391,7 @@ pub fn build_py_enum(
|
|||
}
|
||||
|
||||
fn impl_enum(
|
||||
enum_: PyClassEnum,
|
||||
enum_: PyClassEnum<'_>,
|
||||
args: &PyClassArgs,
|
||||
doc: PythonDoc,
|
||||
methods_type: PyClassMethodsType,
|
||||
|
@ -401,7 +401,7 @@ fn impl_enum(
|
|||
}
|
||||
|
||||
fn impl_enum_class(
|
||||
enum_: PyClassEnum,
|
||||
enum_: PyClassEnum<'_>,
|
||||
args: &PyClassArgs,
|
||||
doc: PythonDoc,
|
||||
methods_type: PyClassMethodsType,
|
||||
|
@ -545,7 +545,7 @@ fn enum_default_slots(
|
|||
gen_default_items(cls, default_items).collect()
|
||||
}
|
||||
|
||||
fn extract_variant_data(variant: &syn::Variant) -> syn::Result<PyClassEnumVariant> {
|
||||
fn extract_variant_data(variant: &syn::Variant) -> syn::Result<PyClassEnumVariant<'_>> {
|
||||
use syn::Fields;
|
||||
let ident = match variant.fields {
|
||||
Fields::Unit => &variant.ident,
|
||||
|
|
Loading…
Reference in New Issue