T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #406 from sunfishcode/wabt-workaround

Browse Source 
Improve the workaround for what is now wabt issue #59.
This commit is contained in:
Dan Gohman
2019-10-07 10:21:13 -07:00
committed by GitHub
parent 53291a8497 292323229c
commit c0b37bb713
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wasmtime-wast/src/wast.rs
View File

@@ -198,7 +198,15 @@ impl WastContext {
/// Run a wast script from a byte buffer. /// Run a wast script from a byte buffer.
pub fn run_buffer(&mut self, filename: &str, wast: &[u8]) -> Result<(), WastFileError> { pub fn run_buffer(&mut self, filename: &str, wast: &[u8]) -> Result<(), WastFileError> {
let features: WabtFeatures = convert_features(self.context.features()); let features: WabtFeatures = convert_features(self.context.features());
let test_filename = "test.wast"; // TODO apparently we can't use filename because this breaks the execution
// Work around https://github.com/pepyakin/wabt-rs/issues/59
let test_filename = Path::new(filename)
.file_name()
.unwrap()
.to_str()
.unwrap()
.to_owned();
let mut parser = ScriptParser::from_source_and_name_with_features( let mut parser = ScriptParser::from_source_and_name_with_features(
str::from_utf8(wast) str::from_utf8(wast)
.map_err(|error| WastFileError { .map_err(|error| WastFileError {
@@ -207,7 +215,7 @@ impl WastContext {
error: WastError::Utf8(error), error: WastError::Utf8(error),
})? })?
.as_bytes(), .as_bytes(),
test_filename, &test_filename,
features, features,
) )
.map_err(|error| WastFileError { .map_err(|error| WastFileError {