Skip to content

Commit d4b39f7

Browse files
sbilligsbillig
authored
Merge pull request argotorg#1368 from sbillig/fix-arg-labels
Re-enable required arg labels
2 parents 378a28e + 46b53ca commit d4b39f7

197 files changed

Lines changed: 1443 additions & 1736 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎crates/codegen/src/sonatina/tests.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ struct Data {
10051005
y: u256,
10061006
}
10071007
1008-
fn choose(flag: bool, d: ref Data) -> ref u256 {
1008+
fn choose(_ flag: bool, _ d: ref Data) -> ref u256 {
10091009
if flag {
10101010
ref d.x
10111011
} else {
@@ -1054,11 +1054,11 @@ struct Reader {
10541054
bias: u256,
10551055
}
10561056
1057-
fn sum_reader(r: ref Reader) -> u256 {
1057+
fn sum_reader(_ r: ref Reader) -> u256 {
10581058
r.source + r.bias
10591059
}
10601060
1061-
fn pass_through(r: own Reader) -> Reader {
1061+
fn pass_through(_ r: own Reader) -> Reader {
10621062
r
10631063
}
10641064
@@ -1214,7 +1214,7 @@ msg FooMsg {
12141214
struct Mixer {}
12151215
12161216
impl Mixer {
1217-
fn mix(input: [u256; 3]) -> [u256; 3] {
1217+
fn mix(_ input: [u256; 3]) -> [u256; 3] {
12181218
let mut out: [u256; 3] = [0, 0, 0]
12191219
for i in 0..3 {
12201220
out[i] = input[i]
@@ -1263,7 +1263,7 @@ const M: [[u256; 3]; 3] = [
12631263
[1, 1, 2],
12641264
]
12651265
1266-
fn mix(state: [u256; 3]) -> [u256; 3] {
1266+
fn mix(_ state: [u256; 3]) -> [u256; 3] {
12671267
let mut out: [u256; 3] = [0, 0, 0]
12681268
for i in 0..3 {
12691269
for j in 0..3 {
@@ -1334,16 +1334,16 @@ use std::evm::Evm
13341334
fn a_init() uses (evm: mut Evm) {
13351335
let len = evm.code_region_len(b_init)
13361336
let offset = evm.code_region_offset(b_init)
1337-
evm.codecopy(dest: 0, offset, len)
1338-
evm.return_data(0, len)
1337+
evm.codecopy(dest: 0, offset: offset, len: len)
1338+
evm.return_data(offset: 0, len: len)
13391339
}
13401340
13411341
#[contract_init(B)]
13421342
fn b_init() uses (evm: mut Evm) {
13431343
let len = evm.code_region_len(a_init)
13441344
let offset = evm.code_region_offset(a_init)
1345-
evm.codecopy(dest: 0, offset, len)
1346-
evm.return_data(0, len)
1345+
evm.codecopy(dest: 0, offset: offset, len: len)
1346+
evm.return_data(offset: 0, len: len)
13471347
}
13481348
13491349
#[test]

‎crates/codegen/tests/fixtures/by_ref_trait_provider_storage_bug.snap‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
source: crates/codegen/tests/yul.rs
3-
assertion_line: 33
43
expression: output
54
input_file: tests/fixtures/by_ref_trait_provider_storage_bug.fe
65
---
@@ -286,8 +285,7 @@ object "ByRefTraitProviderStorageBug" {
286285
v0 := 0x80
287286
}
288287
mstore(64, add(v0, $bytes))
289-
let v1 := $checked_add_u256(v0, $bytes)
290-
mstore(add($self, 96), v1)
288+
mstore(add($self, 96), add(v0, $bytes))
291289
ret := v0
292290
leave
293291
}
@@ -329,11 +327,10 @@ object "ByRefTraitProviderStorageBug" {
329327
mstore($self, v3)
330328
mstore(add($self, 32), v3)
331329
mstore(add($self, 64), v3)
332-
let v4 := $checked_add_u256(v3, $bytes)
333-
mstore(add($self, 96), v4)
330+
mstore(add($self, 96), add(v3, $bytes))
334331
}
335-
let v5 := mload(add($self, 32))
336-
ret := v5
332+
let v4 := mload(add($self, 32))
333+
ret := v4
337334
leave
338335
}
339336
function $solencoder_h1b9228b90dad6928_abiencoder_hffd58d20d4321024_set_base($self, $new_base) {
@@ -348,8 +345,7 @@ object "ByRefTraitProviderStorageBug" {
348345
let v0 := mload(add($self, 64))
349346
let v1 := v0
350347
mstore(v1, $v)
351-
let v2 := $checked_add_u256(v1, 32)
352-
mstore(add($self, 64), v2)
348+
mstore(add($self, 64), add(v1, 32))
353349
leave
354350
}
355351
function $solencoder_h1b9228b90dad6928_new() -> ret {

‎crates/codegen/tests/fixtures/code_region.fe‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ fn init() uses (evm: mut Evm) {
66
let len = evm.code_region_len(child_init)
77
let offset = evm.code_region_offset(child_init)
88
let dest = with (RawMem = evm) { allocate(bytes: len) }
9-
evm.codecopy(dest, offset, len)
10-
evm.create2_raw(value: 0, offset, len: len, salt: 0x1234)
9+
evm.codecopy(dest: dest, offset: offset, len: len)
10+
evm.create2_raw(value: 0, offset: dest, len: len, salt: 0x1234)
1111
}
1212

1313
let len = evm.code_region_len(runtime)
1414
let offset = evm.code_region_offset(runtime)
1515
let dest = with (RawMem = evm) { allocate(bytes: len) }
16-
evm.codecopy(dest, offset, len)
17-
evm.return_data(dest, len)
16+
evm.codecopy(dest: dest, offset: offset, len: len)
17+
evm.return_data(offset: dest, len: len)
1818
}
1919

2020
#[contract_runtime(Foo)]
@@ -26,38 +26,38 @@ fn runtime() uses (evm: mut Evm) {
2626
_ => {}
2727
}
2828
}
29-
evm.return_data(0,0)
29+
evm.return_data(offset: 0, len: 0)
3030
}
3131

3232
#[contract_init(Child)]
3333
fn child_init() uses (evm: mut Evm) {
3434
let len = evm.code_region_len(child_runtime)
3535
let offset = evm.code_region_offset(child_runtime)
36-
evm.codecopy(dest: 0, offset, len)
37-
evm.return_data(0, len)
36+
evm.codecopy(dest: 0, offset: offset, len: len)
37+
evm.return_data(offset: 0, len: len)
3838
}
3939

4040
#[contract_runtime(Child)]
4141
fn child_runtime() uses (evm: mut Evm) {
4242
evm.calldatacopy(dest: 0, offset: 0, len: 4)
43-
evm.return_data(0, 4)
43+
evm.return_data(offset: 0, len: 4)
4444
}
4545

4646
fn allocate(bytes: u256) -> u256 uses (mem: mut RawMem) {
4747
let mut ptr = mem.mload(0x40)
4848
if ptr == 0 {
4949
ptr = 0x60
5050
}
51-
mem.mstore(0x40, ptr + bytes)
51+
mem.mstore(addr: 0x40, value: ptr + bytes)
5252
ptr
5353
}
5454

5555
fn balance() uses (ops: RawOps) {
56-
ops.return_data(0, 0)
56+
ops.return_data(offset: 0, len: 0)
5757
}
5858

5959
fn transfer() uses (ops: RawOps) {
60-
ops.return_data(0, 0)
60+
ops.return_data(offset: 0, len: 0)
6161
}
6262

6363
pub fn read_selector() -> u256 uses (ops: RawOps) {

‎crates/codegen/tests/fixtures/code_region.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object "Foo" {
4545
let v2 := $allocate__Evm_hef0af3106e109414__3af54274b2985741(v0)
4646
let v3 := v2
4747
codecopy(v3, v1, v0)
48-
let v4 := $evm_hef0af3106e109414_create_h3f3c4b410ec53b45_create2_raw_stor_arg0_root_stor(0, v1, v0, 4660)
48+
let v4 := $evm_hef0af3106e109414_create_h3f3c4b410ec53b45_create2_raw_stor_arg0_root_stor(0, v3, v0, 4660)
4949
let v5 := datasize("Foo_deployed")
5050
let v6 := dataoffset("Foo_deployed")
5151
let v7 := $allocate__Evm_hef0af3106e109414__3af54274b2985741(v5)

‎crates/codegen/tests/fixtures/code_region_qualified.fe‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use std::evm::Evm
44
fn init() uses (evm: mut Evm) {
55
let len = evm.code_region_len(self::runtime)
66
let offset = evm.code_region_offset(self::runtime)
7-
evm.codecopy(dest: 0, offset, len)
8-
evm.return_data(0, len)
7+
evm.codecopy(dest: 0, offset: offset, len: len)
8+
evm.return_data(offset: 0, len: len)
99
}
1010

1111
#[contract_runtime(Foo)]
1212
fn runtime() uses (evm: mut Evm) {
13-
evm.return_data(0, 0)
13+
evm.return_data(offset: 0, len: 0)
1414
}

‎crates/codegen/tests/fixtures/const_fn_packed_config.fe‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
// This exercises CTFE support for:
66
// - `match` in `const fn`
77
// - tuple destructuring in `let` bindings
8-
const fn token_params(kind: u8) -> (u8, u16) {
8+
const fn token_params(_ kind: u8) -> (u8, u16) {
99
match kind {
1010
0 => (18, 30),
1111
1 => (6, 5),
1212
_ => (18, 0),
1313
}
1414
}
1515

16-
const fn pack_config(decimals: u8, paused: bool, fee_bps: u16) -> u256 {
16+
const fn pack_config(_ decimals: u8, _ paused: bool, _ fee_bps: u16) -> u256 {
1717
let paused_bit: u256 = if paused { 1 } else { 0 }
1818
let decimals: u256 = decimals as u256
1919
let fee_bps: u256 = fee_bps as u256
@@ -22,7 +22,7 @@ const fn pack_config(decimals: u8, paused: bool, fee_bps: u16) -> u256 {
2222
(paused_bit << 24) | (decimals << 16) | fee_bps
2323
}
2424

25-
const fn packed_token_config(kind: u8, paused: bool) -> u256 {
25+
const fn packed_token_config(_ kind: u8, _ paused: bool) -> u256 {
2626
let (decimals, fee_bps) = token_params(kind)
2727
pack_config(decimals, paused, fee_bps)
2828
}

‎crates/codegen/tests/fixtures/const_u8_array.fe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn pass_then_index() -> u8 {
1919
f(SMALL)
2020
}
2121

22-
fn f(arr: [u8; 2]) -> u8 {
22+
fn f(_ arr: [u8; 2]) -> u8 {
2323
arr[1]
2424
}
2525

‎crates/codegen/tests/fixtures/create_contract.snap‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -742,8 +742,7 @@ object "Factory" {
742742
v0 := 0x80
743743
}
744744
mstore(64, add(v0, $bytes))
745-
let v1 := $checked_add_u256(v0, $bytes)
746-
mstore(add($self, 96), v1)
745+
mstore(add($self, 96), add(v0, $bytes))
747746
ret := v0
748747
leave
749748
}
@@ -785,11 +784,10 @@ object "Factory" {
785784
mstore($self, v3)
786785
mstore(add($self, 32), v3)
787786
mstore(add($self, 64), v3)
788-
let v4 := $checked_add_u256(v3, $bytes)
789-
mstore(add($self, 96), v4)
787+
mstore(add($self, 96), add(v3, $bytes))
790788
}
791-
let v5 := mload(add($self, 32))
792-
ret := v5
789+
let v4 := mload(add($self, 32))
790+
ret := v4
793791
leave
794792
}
795793
function $solencoder_h1b9228b90dad6928_abiencoder_hffd58d20d4321024_set_base($self, $new_base) {
@@ -804,8 +802,7 @@ object "Factory" {
804802
let v0 := mload(add($self, 64))
805803
let v1 := v0
806804
mstore(v1, $v)
807-
let v2 := $checked_add_u256(v1, 32)
808-
mstore(add($self, 64), v2)
805+
mstore(add($self, 64), add(v1, 32))
809806
leave
810807
}
811808
function $solencoder_h1b9228b90dad6928_new() -> ret {

‎crates/codegen/tests/fixtures/effect_handle_field_deref.snap‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
source: crates/codegen/tests/yul.rs
3-
assertion_line: 33
43
expression: output
54
input_file: tests/fixtures/effect_handle_field_deref.fe
65
---
@@ -469,8 +468,7 @@ object "EffectHandleFieldDeref" {
469468
v0 := 0x80
470469
}
471470
mstore(64, add(v0, $bytes))
472-
let v1 := $checked_add_u256(v0, $bytes)
473-
mstore(add($self, 96), v1)
471+
mstore(add($self, 96), add(v0, $bytes))
474472
ret := v0
475473
leave
476474
}
@@ -512,11 +510,10 @@ object "EffectHandleFieldDeref" {
512510
mstore($self, v3)
513511
mstore(add($self, 32), v3)
514512
mstore(add($self, 64), v3)
515-
let v4 := $checked_add_u256(v3, $bytes)
516-
mstore(add($self, 96), v4)
513+
mstore(add($self, 96), add(v3, $bytes))
517514
}
518-
let v5 := mload(add($self, 32))
519-
ret := v5
515+
let v4 := mload(add($self, 32))
516+
ret := v4
520517
leave
521518
}
522519
function $solencoder_h1b9228b90dad6928_abiencoder_hffd58d20d4321024_set_base($self, $new_base) {
@@ -531,8 +528,7 @@ object "EffectHandleFieldDeref" {
531528
let v0 := mload(add($self, 64))
532529
let v1 := v0
533530
mstore(v1, $v)
534-
let v2 := $checked_add_u256(v1, 32)
535-
mstore(add($self, 64), v2)
531+
mstore(add($self, 64), add(v1, 32))
536532
leave
537533
}
538534
function $solencoder_h1b9228b90dad6928_new() -> ret {

‎crates/codegen/tests/fixtures/enum_variant_contract.fe‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ enum MyOption {
77

88
fn abi_encode_u256(value: u256) -> ! uses (ops: mut RawOps) {
99
let ptr: u256 = 0
10-
ops.mstore(ptr, value)
11-
ops.return_data(ptr, 32)
10+
ops.mstore(addr: ptr, value: value)
11+
ops.return_data(offset: ptr, len: 32)
1212
}
1313

1414
#[contract_init(EnumContract)]
1515
fn init() uses (evm: mut Evm) {
1616
let len = evm.code_region_len(runtime)
1717
let offset = evm.code_region_offset(runtime)
18-
evm.codecopy(dest: 0, offset, len)
19-
evm.return_data(0, len)
18+
evm.codecopy(dest: 0, offset: offset, len: len)
19+
evm.return_data(offset: 0, len: len)
2020
}
2121

2222
#[contract_runtime(EnumContract)]
@@ -58,5 +58,5 @@ fn runtime() uses (evm: mut Evm) {
5858
with (RawOps = evm) { abi_encode_u256(value: result) }
5959
}
6060

61-
evm.return_data(0, 0)
61+
evm.return_data(offset: 0, len: 0)
6262
}

0 commit comments

Comments
 (0)