Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wasmer run not interpreting URLs correctly + display fixes #3370

Merged
merged 31 commits into from
Nov 25, 2022

Conversation

fschutt
Copy link
Contributor

@fschutt fschutt commented Nov 24, 2022

Fixes #3366.
Fixes #3346.

Should land in the 3.0.2 release.

@fschutt fschutt requested a review from syrusakbary as a code owner November 24, 2022 16:27
@fschutt fschutt changed the title Fix wasmer run not in Fix wasmer run not interpreting URLs correctly + display fixes Nov 24, 2022
lib/registry/src/lib.rs Outdated Show resolved Hide resolved
tests/integration/cli/tests/run.rs Outdated Show resolved Hide resolved
lib/cli/src/commands/run.rs Outdated Show resolved Hide resolved
lib/cli/src/commands/run.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@Michael-F-Bryan Michael-F-Bryan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the colored thing has been updated so this should be good to merge.

Copy link
Member

@syrusakbary syrusakbary left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Address comments

.gitignore Outdated Show resolved Hide resolved
}

fn test_no_imports_wat_path() -> String {
format!("{}/{}", ASSET_PATH, "fib.wat")
let slash = if ASSET_PATH.ends_with('/') { "" } else { "/" };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the correct way of joining paths. We should use the std os path join and return a Path

@fschutt
Copy link
Contributor Author

fschutt commented Nov 25, 2022

bors r+

@syrusakbary
Copy link
Member

Merging manually as tests should pass

bors bot added a commit that referenced this pull request Nov 25, 2022
3370: Fix wasmer run not interpreting URLs correctly + display fixes r=fschutt a=fschutt

Fixes #3366.
Fixes #3346.

Should land in the 3.0.2 release.

Co-authored-by: Felix Schütt <[email protected]>
Co-authored-by: Felix Schütt <[email protected]>
@syrusakbary syrusakbary merged commit dcfdea7 into master Nov 25, 2022
@syrusakbary syrusakbary deleted the fix-3366 branch November 25, 2022 20:02
@bors
Copy link
Contributor

bors bot commented Nov 25, 2022

This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

wasmer run {url} interprets c:// file paths as URLs on Windows Wasmer not showing right stdout on CLI apps
3 participants