Upgrade to edition 2021
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
extern crate rustijvm;
|
||||
fn steps(machine: &mut rustijvm::Machine, num: usize) {
|
||||
fn steps(machine: &mut rustijvm::machine::Machine, num: usize) {
|
||||
for _ in 0..num {
|
||||
machine.step().unwrap();
|
||||
}
|
||||
@@ -7,7 +7,7 @@ fn steps(machine: &mut rustijvm::Machine, num: usize) {
|
||||
|
||||
#[test]
|
||||
fn task5_invokenoargs() {
|
||||
let mut machine = rustijvm::Machine::new_from_file("files/task5/TestInvokeNoArgs.ijvm").unwrap();
|
||||
let mut machine = rustijvm::machine::Machine::new_from_file("files/task5/TestInvokeNoArgs.ijvm").unwrap();
|
||||
machine.set_output(rustijvm::stubs::output_stub());
|
||||
|
||||
steps(&mut machine, 2);
|
||||
@@ -20,7 +20,7 @@ fn task5_invokenoargs() {
|
||||
|
||||
#[test]
|
||||
fn task5_invoke1() {
|
||||
let mut machine = rustijvm::Machine::new_from_file("files/task5/test-invokevirtual1.ijvm").unwrap();
|
||||
let mut machine = rustijvm::machine::Machine::new_from_file("files/task5/test-invokevirtual1.ijvm").unwrap();
|
||||
machine.set_output(rustijvm::stubs::output_stub());
|
||||
|
||||
steps(&mut machine, 3);
|
||||
@@ -34,7 +34,7 @@ fn task5_invoke1() {
|
||||
|
||||
#[test]
|
||||
fn task5_ireturn1() {
|
||||
let mut machine = rustijvm::Machine::new_from_file("files/task5/test-invokevirtual1.ijvm").unwrap();
|
||||
let mut machine = rustijvm::machine::Machine::new_from_file("files/task5/test-invokevirtual1.ijvm").unwrap();
|
||||
machine.set_output(rustijvm::stubs::output_stub());
|
||||
|
||||
steps(&mut machine, 6);
|
||||
@@ -45,7 +45,7 @@ fn task5_ireturn1() {
|
||||
|
||||
#[test]
|
||||
fn task5_invoke2() {
|
||||
let mut machine = rustijvm::Machine::new_from_file("files/task5/test-invokevirtual2.ijvm").unwrap();
|
||||
let mut machine = rustijvm::machine::Machine::new_from_file("files/task5/test-invokevirtual2.ijvm").unwrap();
|
||||
machine.set_output(rustijvm::stubs::output_stub());
|
||||
|
||||
steps(&mut machine, 5);
|
||||
@@ -61,7 +61,7 @@ fn task5_invoke2() {
|
||||
|
||||
#[test]
|
||||
fn task5_ireturn2() {
|
||||
let mut machine = rustijvm::Machine::new_from_file("files/task5/test-invokevirtual2.ijvm").unwrap();
|
||||
let mut machine = rustijvm::machine::Machine::new_from_file("files/task5/test-invokevirtual2.ijvm").unwrap();
|
||||
machine.set_output(rustijvm::stubs::output_stub());
|
||||
|
||||
steps(&mut machine, 10);
|
||||
|
||||
Reference in New Issue
Block a user