Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@tcoratger
tcoratger committed Aug 29, 2024
1 parent 2985dbf commit e2ecd74
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
3 changes: 0 additions & 3 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/metadata/debug_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ mod test {
let sierra_program = utils::cairo_to_sierra(program_path);

let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();

let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

Expand Down Expand Up @@ -1126,7 +1126,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();

let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

Expand Down Expand Up @@ -1168,7 +1168,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();

let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

Expand Down Expand Up @@ -1210,7 +1210,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();
let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

debug_utils.register_impls(&engine);
Expand Down Expand Up @@ -1250,7 +1250,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();
let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

debug_utils.register_impls(&engine);
Expand Down Expand Up @@ -1292,7 +1292,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();
let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

debug_utils.register_impls(&engine);
Expand Down Expand Up @@ -1336,7 +1336,7 @@ mod test {

let native_context = NativeContext::new();

let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();

let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

Expand Down Expand Up @@ -1378,7 +1378,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();
let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

debug_utils.register_impls(&engine);
Expand Down Expand Up @@ -1419,7 +1419,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();
let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

debug_utils.register_impls(&engine);
Expand Down Expand Up @@ -1460,7 +1460,7 @@ mod test {
let program_path = Path::new("programs/examples/hello.cairo");
let sierra_program = utils::cairo_to_sierra(program_path);
let native_context = NativeContext::new();
let native_program = native_context.compile(&sierra_program, None).unwrap();
let native_program = native_context.compile(&sierra_program).unwrap();
let engine = ExecutionEngine::new(&native_program.module, 2, &[], false);

debug_utils.register_impls(&engine);
Expand Down

0 comments on commit e2ecd74

Please sign in to comment.