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 small return types. #379

Merged
merged 7 commits into from
Apr 22, 2019
Merged

Fix small return types. #379

merged 7 commits into from
Apr 22, 2019

Conversation

lachlansneff
Copy link
Contributor

This fixes returning integers smaller than 32bits from imported functions. Also some work on fixing returning errors from functions.

@lachlansneff
Copy link
Contributor Author

bors try

bors bot added a commit that referenced this pull request Apr 22, 2019
@bors
Copy link
Contributor

bors bot commented Apr 22, 2019

try

Build failed

@lachlansneff
Copy link
Contributor Author

bors try

bors bot added a commit that referenced this pull request Apr 22, 2019
@bors
Copy link
Contributor

bors bot commented Apr 22, 2019

@syrusakbary
Copy link
Member

It works on Linux, @xmclark will test on Windows

pub const __WASI_ETIMEDOUT: u16 = 73;
pub const __WASI_ETXTBSY: u16 = 74;
pub const __WASI_EXDEV: u16 = 75;
pub const __WASI_ENOTCAPABLE: u16 = 76;
Copy link
Contributor

Choose a reason for hiding this comment

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

We should revert everything else. The fix changed all u16s to u32s

Copy link
Member

Choose a reason for hiding this comment

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

Fixed

… errors from imported functions"

This reverts commit 74b6ba4.

# Conflicts:
#	lib/wasi/src/syscalls/mod.rs
This reverts commit 48a8391, reversing
changes made to 363b46e.
@syrusakbary
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Apr 22, 2019
379: Fix small return types. r=syrusakbary a=lachlansneff

This fixes returning integers smaller than 32bits from imported functions. Also some work on fixing returning errors from functions.

Co-authored-by: Lachlan Sneff <lachlan.sneff@gmail.com>
Co-authored-by: Syrus <me@syrusakbary.com>
@MarkMcCaskey
Copy link
Contributor

bors retry

bors bot added a commit that referenced this pull request Apr 22, 2019
379: Fix small return types. r=syrusakbary a=lachlansneff

This fixes returning integers smaller than 32bits from imported functions. Also some work on fixing returning errors from functions.

Co-authored-by: Lachlan Sneff <lachlan.sneff@gmail.com>
Co-authored-by: Syrus <me@syrusakbary.com>
@lachlansneff
Copy link
Contributor Author

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 22, 2019

Already running a review

@bors
Copy link
Contributor

bors bot commented Apr 22, 2019

@bors bors bot merged commit 3729c4a into master Apr 22, 2019
@bors bors bot deleted the fix/small-return-types branch April 22, 2019 19:58
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.

3 participants