mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-03 18:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove Parse trait (#6235)

Browse source
This commit is contained in:
Micha Reiser 2023-08-01 18:35:03 +02:00 • committed by GitHub
parent 83fe103d6e
commit debfca3a11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 235 additions and 1420 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ruff_python_codegen/src/generator.rs
View file

@ -1503,8 +1503,8 @@ impl<'a> Generator<'a> {
#[cfg(test)]
mod tests {
use ruff_python_ast::{Mod, ModModule, Stmt};
use ruff_python_parser::{self, Mode, Parse};
use ruff_python_ast::{Mod, ModModule};
use ruff_python_parser::{self, parse_suite, Mode};
use ruff_source_file::LineEnding;
@ -1515,9 +1515,9 @@ mod tests {
let indentation = Indentation::default();
let quote = Quote::default();
let line_ending = LineEnding::default();
let stmt = Stmt::parse(contents, "<filename>").unwrap();
let stmt = parse_suite(contents, "<filename>").unwrap();
let mut generator = Generator::new(&indentation, quote, line_ending);
generator.unparse_stmt(&stmt);
generator.unparse_suite(&stmt);
generator.generate()
}
@ -1527,9 +1527,9 @@ mod tests {
line_ending: LineEnding,
contents: &str,
) -> String {
let stmt = Stmt::parse(contents, "<filename>").unwrap();
let stmt = parse_suite(contents, "<filename>").unwrap();
let mut generator = Generator::new(indentation, quote, line_ending);
generator.unparse_stmt(&stmt);
generator.unparse_suite(&stmt);
generator.generate()
}

5
crates/ruff_python_codegen/src/lib.rs
View file

@ -2,15 +2,14 @@ mod generator;
mod stylist;
pub use generator::Generator;
use ruff_python_ast::Suite;
use ruff_python_parser::{lexer, Mode, Parse, ParseError};
use ruff_python_parser::{lexer, parse_suite, Mode, ParseError};
use ruff_source_file::Locator;
pub use stylist::{Quote, Stylist};
/// Run round-trip source code generation on a given Python code.
pub fn round_trip(code: &str, source_path: &str) -> Result<String, ParseError> {
let locator = Locator::new(code);
let python_ast = Suite::parse(code, source_path)?;
let python_ast = parse_suite(code, source_path)?;
let tokens: Vec<_> = lexer::lex(code, Mode::Module).collect();
let stylist = Stylist::from_tokens(&tokens, &locator);
let mut generator: Generator = (&stylist).into();