diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs index 0b0f2877c7..bf0fbe1dec 100644 --- a/compiler/codegen/src/compile.rs +++ b/compiler/codegen/src/compile.rs @@ -2941,7 +2941,8 @@ impl ToU32 for usize { #[cfg(test)] mod tests { use super::*; - use rustpython_parser as parser; + use rustpython_parser::ast::Suite; + use rustpython_parser::Parse; use rustpython_parser_core::source_code::LinearLocator; fn compile_exec(source: &str) -> CodeObject { @@ -2952,7 +2953,7 @@ mod tests { "source_path".to_owned(), "".to_owned(), ); - let ast = parser::parse_program(source, "").unwrap(); + let ast = Suite::parse(source, "").unwrap(); let ast = locator.fold(ast).unwrap(); let symbol_scope = SymbolTable::scan_program(&ast).unwrap(); compiler.compile_program(&ast, symbol_scope).unwrap(); diff --git a/examples/parse_folder.rs b/examples/parse_folder.rs index 7774b8afbf..7055a6f831 100644 --- a/examples/parse_folder.rs +++ b/examples/parse_folder.rs @@ -12,7 +12,7 @@ extern crate env_logger; extern crate log; use clap::{App, Arg}; -use rustpython_parser::{self as parser, ast}; +use rustpython_parser::{self as parser, ast, Parse}; use std::{ path::Path, time::{Duration, Instant}, @@ -85,8 +85,8 @@ fn parse_python_file(filename: &Path) -> ParsedFile { }, Ok(source) => { let num_lines = source.lines().count(); - let result = parser::parse_program(&source, &filename.to_string_lossy()) - .map_err(|e| e.to_string()); + let result = + ast::Suite::parse(&source, &filename.to_string_lossy()).map_err(|e| e.to_string()); ParsedFile { // filename: Box::new(filename.to_path_buf()), // code: source.to_string(),