Skip to content

Update to syn2 #5556

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 2 commits into from
Feb 25, 2025
Merged

Update to syn2 #5556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b74892
Update to syn2
coolreader18 Feb 24, 2025
d978084
Switch to syn-ext 0.5
coolreader18 Feb 24, 2025
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: 7 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ schannel = "0.1.27"
static_assertions = "1.1"
strum = "0.27"
strum_macros = "0.27"
syn = "1.0.109"
syn = "2"
thiserror = "2.0"
thread_local = "1.1.8"
unicode_names2 = "1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion derive-impl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ syn = { workspace = true, features = ["full", "extra-traits"] }
maplit = "1.0.2"
proc-macro2 = "1.0.93"
quote = "1.0.38"
syn-ext = { version = "0.4.0", features = ["full"] }
syn-ext = { version = "0.5.0", features = ["full"] }
textwrap = { version = "0.16.1", default-features = false }

[lints]
Expand Down
151 changes: 60 additions & 91 deletions derive-impl/src/compile_bytecode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//! )
//! ```

use crate::{extract_spans, Diagnostic};
use crate::Diagnostic;
use once_cell::sync::Lazy;
use proc_macro2::{Span, TokenStream};
use quote::quote;
Expand All @@ -25,10 +25,9 @@ use std::{
};
use syn::{
self,
parse::{Parse, ParseStream, Result as ParseResult},
parse2,
parse::{ParseStream, Parser, Result as ParseResult},
spanned::Spanned,
Lit, LitByteStr, LitStr, Macro, Meta, MetaNameValue, Token,
LitByteStr, LitStr, Macro,
};

static CARGO_MANIFEST_DIR: Lazy<PathBuf> = Lazy::new(|| {
Expand Down Expand Up @@ -233,83 +232,76 @@ impl CompilationSource {
}
}

/// This is essentially just a comma-separated list of Meta nodes, aka the inside of a MetaList.
struct PyCompileInput {
span: Span,
metas: Vec<Meta>,
}

impl PyCompileInput {
fn parse(&self, allow_dir: bool) -> Result<PyCompileArgs, Diagnostic> {
impl PyCompileArgs {
fn parse(input: TokenStream, allow_dir: bool) -> Result<PyCompileArgs, Diagnostic> {
let mut module_name = None;
let mut mode = None;
let mut source: Option<CompilationSource> = None;
let mut crate_name = None;

fn assert_source_empty(source: &Option<CompilationSource>) -> Result<(), Diagnostic> {
fn assert_source_empty(source: &Option<CompilationSource>) -> Result<(), syn::Error> {
if let Some(source) = source {
Err(Diagnostic::spans_error(
source.span,
Err(syn::Error::new(
source.span.0,
"Cannot have more than one source",
))
} else {
Ok(())
}
}

for meta in &self.metas {
if let Meta::NameValue(name_value) = meta {
let ident = match name_value.path.get_ident() {
Some(ident) => ident,
None => continue,
};
let check_str = || match &name_value.lit {
Lit::Str(s) => Ok(s),
_ => Err(err_span!(name_value.lit, "{ident} must be a string")),
};
if ident == "mode" {
let s = check_str()?;
match s.value().parse() {
Ok(mode_val) => mode = Some(mode_val),
Err(e) => bail_span!(s, "{}", e),
}
} else if ident == "module_name" {
module_name = Some(check_str()?.value())
} else if ident == "source" {
assert_source_empty(&source)?;
let code = check_str()?.value();
source = Some(CompilationSource {
kind: CompilationSourceKind::SourceCode(code),
span: extract_spans(&name_value).unwrap(),
});
} else if ident == "file" {
assert_source_empty(&source)?;
let path = check_str()?.value().into();
source = Some(CompilationSource {
kind: CompilationSourceKind::File(path),
span: extract_spans(&name_value).unwrap(),
});
} else if ident == "dir" {
if !allow_dir {
bail_span!(ident, "py_compile doesn't accept dir")
}

assert_source_empty(&source)?;
let path = check_str()?.value().into();
source = Some(CompilationSource {
kind: CompilationSourceKind::Dir(path),
span: extract_spans(&name_value).unwrap(),
});
} else if ident == "crate_name" {
let name = check_str()?.parse()?;
crate_name = Some(name);
syn::meta::parser(|meta| {
let ident = meta
.path
.get_ident()
.ok_or_else(|| meta.error("unknown arg"))?;
let check_str = || meta.value()?.call(parse_str);
if ident == "mode" {
let s = check_str()?;
match s.value().parse() {
Ok(mode_val) => mode = Some(mode_val),
Err(e) => bail_span!(s, "{}", e),
}
} else if ident == "module_name" {
module_name = Some(check_str()?.value())
} else if ident == "source" {
assert_source_empty(&source)?;
let code = check_str()?.value();
source = Some(CompilationSource {
kind: CompilationSourceKind::SourceCode(code),
span: (ident.span(), meta.input.cursor().span()),
});
} else if ident == "file" {
assert_source_empty(&source)?;
let path = check_str()?.value().into();
source = Some(CompilationSource {
kind: CompilationSourceKind::File(path),
span: (ident.span(), meta.input.cursor().span()),
});
} else if ident == "dir" {
if !allow_dir {
bail_span!(ident, "py_compile doesn't accept dir")
}

assert_source_empty(&source)?;
let path = check_str()?.value().into();
source = Some(CompilationSource {
kind: CompilationSourceKind::Dir(path),
span: (ident.span(), meta.input.cursor().span()),
});
} else if ident == "crate_name" {
let name = check_str()?.parse()?;
crate_name = Some(name);
} else {
return Err(meta.error("unknown attr"));
}
}
Ok(())
})
.parse2(input)?;

let source = source.ok_or_else(|| {
syn::Error::new(
self.span,
Span::call_site(),
"Must have either file or source in py_compile!()/py_freeze!()",
)
})?;
Expand All @@ -323,38 +315,17 @@ impl PyCompileInput {
}
}

fn parse_meta(input: ParseStream) -> ParseResult<Meta> {
let path = input.call(syn::Path::parse_mod_style)?;
let eq_token: Token![=] = input.parse()?;
fn parse_str(input: ParseStream) -> ParseResult<LitStr> {
let span = input.span();
if input.peek(LitStr) {
Ok(Meta::NameValue(MetaNameValue {
path,
eq_token,
lit: Lit::Str(input.parse()?),
}))
input.parse()
} else if let Ok(mac) = input.parse::<Macro>() {
Ok(Meta::NameValue(MetaNameValue {
path,
eq_token,
lit: Lit::Str(LitStr::new(&mac.tokens.to_string(), mac.span())),
}))
Ok(LitStr::new(&mac.tokens.to_string(), mac.span()))
} else {
Err(syn::Error::new(span, "Expected string or stringify macro"))
}
}

impl Parse for PyCompileInput {
fn parse(input: ParseStream) -> ParseResult<Self> {
let span = input.cursor().span();
let metas = input
.parse_terminated::<Meta, Token![,]>(parse_meta)?
.into_iter()
.collect();
Ok(PyCompileInput { span, metas })
}
}

struct PyCompileArgs {
source: CompilationSource,
mode: Mode,
Expand All @@ -366,8 +337,7 @@ pub fn impl_py_compile(
input: TokenStream,
compiler: &dyn Compiler,
) -> Result<TokenStream, Diagnostic> {
let input: PyCompileInput = parse2(input)?;
let args = input.parse(false)?;
let args = PyCompileArgs::parse(input, false)?;

let crate_name = args.crate_name;
let code = args
Expand All @@ -388,8 +358,7 @@ pub fn impl_py_freeze(
input: TokenStream,
compiler: &dyn Compiler,
) -> Result<TokenStream, Diagnostic> {
let input: PyCompileInput = parse2(input)?;
let args = input.parse(true)?;
let args = PyCompileArgs::parse(input, true)?;

let crate_name = args.crate_name;
let code_map = args.source.compile(args.mode, args.module_name, compiler)?;
Expand Down
Loading
Loading