Skip to content

Commit 365652b

Browse files
committed
Fix merge issues
1 parent 8b7d3a6 commit 365652b

File tree

2 files changed

+2
-0
lines changed
  • test/src/e2e_vm_tests/test_programs/should_fail

2 files changed

+2
-0
lines changed

test/src/e2e_vm_tests/test_programs/should_fail/attributes_invalid_args/stdout.snap

+1
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ error: Attribute argument is invalid
194194
| ----- help: - target
195195
| ----- help: - experimental_const_generics
196196
| ----- help: - experimental_error_type
197+
| ----- help: - experimental_merge_core_std
197198
| ----- help: - experimental_new_encoding
198199
| ----- help: - experimental_partial_eq
199200
| ----- help: - experimental_references

test/src/e2e_vm_tests/test_programs/should_fail/attributes_invalid_cfg_arg_with_invalid_item/stdout.snap

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ error: Attribute argument is invalid
2727
| - help: - target
2828
| - help: - experimental_const_generics
2929
| - help: - experimental_error_type
30+
| - help: - experimental_merge_core_std
3031
| - help: - experimental_new_encoding
3132
| - help: - experimental_partial_eq
3233
| - help: - experimental_references

0 commit comments

Comments
 (0)