refactor: simplify data segment parsing by using zip for segment indexing

Arnaud Riess · Arnaud Riess · commit 0830549f9191 · 2026-03-14T16:59:11.000Z
diff --git a/crates/herkos/src/parser/mod.rs b/crates/herkos/src/parser/mod.rs
@@ -441,8 +441,7 @@ pub fn parse_wasm(wasm_bytes: &[u8]) -> Result<ParsedModule> {
             }
 
             Payload::DataSection(reader) => {
-                let mut segment_index: u32 = 0;
-                for data in reader {
+                for (segment_index, data) in (0_u32..).zip(reader) {
                     let data = data.context("reading data segment")?;
                     match data.kind {
                         wasmparser::DataKind::Active {
@@ -471,7 +470,6 @@ pub fn parse_wasm(wasm_bytes: &[u8]) -> Result<ParsedModule> {
                             );
                         }
                     }
-                    segment_index += 1;
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -441,8 +441,7 @@ pub fn parse_wasm(wasm_bytes: &[u8]) -> Result<ParsedModule> {`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`Payload::DataSection(reader) => {`
`444`		`- let mut segment_index: u32 = 0;`
`445`		`- for data in reader {`
	`444`	`+ for (segment_index, data) in (0_u32..).zip(reader) {`
`446`	`445`	`let data = data.context("reading data segment")?;`
`447`	`446`	`match data.kind {`
`448`	`447`	`wasmparser::DataKind::Active {`
`@@ -471,7 +470,6 @@ pub fn parse_wasm(wasm_bytes: &[u8]) -> Result<ParsedModule> {`
`471`	`470`	`);`
`472`	`471`	`}`
`473`	`472`	`}`
`474`		`- segment_index += 1;`
`475`	`473`	`}`
`476`	`474`	`}`
`477`	`475`