Skip to content

Commit f6230a8

Browse files
authored
Update wasmparser to v0.230.0, adjust parser to support this (#769)
* Update wasmparser to v0.230.0, adjust parser to support this * run cargo fmt
1 parent 5f7066a commit f6230a8

File tree

4 files changed

+261
-244
lines changed

4 files changed

+261
-244
lines changed

Cargo.lock

Lines changed: 75 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

parser/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ path = "./parser.rs"
1515
[dependencies]
1616
anyhow = "1.0"
1717
object = { version = "0.36.7", optional = true }
18-
wasmparser = "0.80.0"
18+
wasmparser = "0.230.0"
1919
twiggy-ir = { version = "=0.7.0", path = "../ir" }
2020
twiggy-traits = { version = "=0.7.0", path = "../traits" }
2121

parser/parser.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub(crate) trait Parse<'a> {
4747

4848
/// Parse `Self` into one or more `ir::Item`s and add them to the builder.
4949
fn parse_items(
50-
&mut self,
50+
self,
5151
items: &mut ir::ItemsBuilder,
5252
extra: Self::ItemsExtra,
5353
) -> anyhow::Result<()>;
@@ -58,7 +58,7 @@ pub(crate) trait Parse<'a> {
5858
/// Parse edges between items. This is only called *after* we have already
5959
/// parsed items.
6060
fn parse_edges(
61-
&mut self,
61+
self,
6262
items: &mut ir::ItemsBuilder,
6363
extra: Self::EdgesExtra,
6464
) -> anyhow::Result<()>;
@@ -86,9 +86,9 @@ fn sniff_wasm(extension: Option<&OsStr>, data: &[u8]) -> bool {
8686
fn parse_wasm(data: &[u8]) -> anyhow::Result<ir::Items> {
8787
let mut items = ir::ItemsBuilder::new(data.len() as u32);
8888

89-
let mut module1 = wasm_parse::ModuleReader::new(data);
89+
let module1 = wasm_parse::ModuleReader::new(data);
9090
module1.parse_items(&mut items, ())?;
91-
let mut module2 = wasm_parse::ModuleReader::new(data);
91+
let module2 = wasm_parse::ModuleReader::new(data);
9292
module2.parse_edges(&mut items, ())?;
9393

9494
Ok(items.finish())

0 commit comments

Comments
 (0)