Skip to content

Commit d7275c7

Browse files
authored
Merge pull request RustPython#837 from skinny121/main_rs_cleanup
Use new_syntax_error in main.rs
2 parents 827f830 + 2248635 commit d7275c7

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/main.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,8 @@ fn main() {
6565
}
6666

6767
fn _run_string(vm: &VirtualMachine, source: &str, source_path: String) -> PyResult {
68-
let code_obj =
69-
compile::compile(vm, source, &compile::Mode::Exec, source_path).map_err(|err| {
70-
let syntax_error = vm.context().exceptions.syntax_error.clone();
71-
vm.new_exception(syntax_error, err.to_string())
72-
})?;
68+
let code_obj = compile::compile(vm, source, &compile::Mode::Exec, source_path)
69+
.map_err(|err| vm.new_syntax_error(&err))?;
7370
// trace!("Code object: {:?}", code_obj.borrow());
7471
let vars = vm.ctx.new_scope(); // Keep track of local variables
7572
vm.run_code_obj(code_obj, vars)
@@ -120,8 +117,7 @@ fn shell_exec(vm: &VirtualMachine, source: &str, scope: Scope) -> Result<(), Com
120117
// Don't inject syntax errors for line continuation
121118
Err(err @ CompileError::Parse(ParseError::EOF(_))) => Err(err),
122119
Err(err) => {
123-
let syntax_error = vm.context().exceptions.syntax_error.clone();
124-
let exc = vm.new_exception(syntax_error, format!("{}", err));
120+
let exc = vm.new_syntax_error(&err);
125121
print_exception(vm, &exc);
126122
Err(err)
127123
}

0 commit comments

Comments
 (0)