Get fuzz targets building again

Author: alexcrichton

fuzz/Cargo.toml

@@ -9,6 +9,7 @@ cargo-fuzz = true
 
 [dependencies]
 wast = { path = ".." }
+wast-parser = { path = "../crates/parser" }
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys" }
 
 [[bin]]

fuzz/fuzz_targets/binary.rs

@@ -4,22 +4,8 @@ use libfuzzer_sys::*;
 use std::str;
 
 fuzz_target!(|data: &[u8]| {
-    let s = match str::from_utf8(data) {
-        Ok(s) => s,
-        Err(_) => return,
-    };
-    let buf = match wast::parser::ParseBuffer::new(s) {
-        Ok(b) => b,
-        Err(_) => return,
-    };
-    let mut wat = match wast::parser::parse::<wast::ast::Wat>(&buf) {
-        Ok(m) => m,
-        Err(_) => return,
-    };
-
-    match wast::resolve::resolve(&mut wat.module) {
-        Ok(()) => (),
-        Err(_) => return,
+    match str::from_utf8(data) {
+        Ok(s) => drop(wast::parse_str(s)),
+        Err(_) => {}
     }
-    wast::binary::encode(&wat.module);
 });

fuzz/fuzz_targets/lexer.rs

@@ -8,7 +8,7 @@ fuzz_target!(|data: &[u8]| {
         Ok(s) => s,
         Err(_) => return,
     };
-    let mut l = wast::lexer::Lexer::new(s);
+    let mut l = wast_parser::lexer::Lexer::new(s);
     while let Ok(Some(_)) = l.parse() {
         // ...
     }

fuzz/fuzz_targets/parser.rs

@@ -8,9 +8,9 @@ fuzz_target!(|data: &[u8]| {
         Ok(s) => s,
         Err(_) => return,
     };
-    let buf = match wast::parser::ParseBuffer::new(s) {
+    let buf = match wast_parser::parser::ParseBuffer::new(s) {
         Ok(b) => b,
         Err(_) => return,
     };
-    drop(wast::parser::parse::<wast::ast::Wast>(&buf));
+    drop(wast_parser::parser::parse::<wast_parser::ast::Wast>(&buf));
 });

src/lib.rs

@@ -68,7 +68,7 @@
 #![deny(missing_docs)]
 
 use std::fmt;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use wast_parser::ast;
 use wast_parser::binary;
 use wast_parser::parser::{self, ParseBuffer};