Remove Parse trait (#6235)

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

View file

@ -1,5 +1,4 @@
use ruff_python_ast::Stmt;
use ruff_python_parser::{Parse, ParseError};
use ruff_python_parser::{parse_suite, ParseError};
use ruff_text_size::{TextRange, TextSize};
use ruff_python_ast::identifier;
@ -13,8 +12,9 @@ else:
pass
"#
.trim();
let stmt = Stmt::parse(contents, "<filename>")?;
let range = identifier::else_(&stmt, contents).unwrap();
let stmts = parse_suite(contents, "<filename>")?;
let stmt = stmts.first().unwrap();
let range = identifier::else_(stmt, contents).unwrap();
assert_eq!(&contents[range], "else");
assert_eq!(
range,

View file

@ -1,6 +1,6 @@
use ruff_python_ast::stmt_if::elif_else_range;
use ruff_python_ast::Stmt;
use ruff_python_parser::{Parse, ParseError};
use ruff_python_parser::{parse_suite, ParseError};
use ruff_text_size::TextSize;
#[test]
@ -10,8 +10,11 @@ fn extract_elif_else_range() -> Result<(), ParseError> {
elif b:
...
";
let stmt = Stmt::parse(contents, "<filename>")?;
let stmt = Stmt::as_if_stmt(&stmt).unwrap();
let mut stmts = parse_suite(contents, "<filename>")?;
let stmt = stmts
.pop()
.and_then(ruff_python_ast::Stmt::if_stmt)
.unwrap();
let range = elif_else_range(&stmt.elif_else_clauses[0], contents).unwrap();
assert_eq!(range.start(), TextSize::from(14));
assert_eq!(range.end(), TextSize::from(18));
@ -21,8 +24,11 @@ elif b:
else:
...
";
let stmt = Stmt::parse(contents, "<filename>")?;
let stmt = Stmt::as_if_stmt(&stmt).unwrap();
let mut stmts = parse_suite(contents, "<filename>")?;
let stmt = stmts
.pop()
.and_then(ruff_python_ast::Stmt::if_stmt)
.unwrap();
let range = elif_else_range(&stmt.elif_else_clauses[0], contents).unwrap();
assert_eq!(range.start(), TextSize::from(14));
assert_eq!(range.end(), TextSize::from(18));