Fix emscripten setup, nginx works #165

lachlansneff · 2019-02-08T18:30:26Z

No description provided.

xmclark · 2019-02-08T18:33:14Z

lib/emscripten/src/storage.rs

+    // NOTE: The `4294967280` is a u32 conversion of -16 as gotten from emscripten.
+    *static_top = (*static_top + size + 15) & 4294967280;
+    old_static_top
+}


yay! get this commented code out.

xmclark · 2019-02-08T18:34:01Z

Good job!

bjfish · 2019-02-08T18:35:45Z

lib/emscripten/src/lib.rs

@@ -265,7 +222,7 @@ pub struct EmscriptenGlobals {
 }

 impl EmscriptenGlobals {
-    pub fn new(module: &Module) -> Self {
+    pub fn new(module: &Module /*, static_bump: u32 */) -> Self {


Is this needed /*, static_bump: u32 */ ?

the static_bump is emscripten module independent, but we've hardcoded the one for nginx here. The user has to pull the constant out of the generated js file, since there is no provided metadata in emscripten modules. We should make it variable at some point, and this is a reminder.

lib/emscripten/src/lib.rs

…emscripten

1026: Bump smallvec from 0.6.13 to 1.0.0 r=MarkMcCaskey a=dependabot-preview[bot] Bumps [smallvec](https://github.com/servo/rust-smallvec) from 0.6.13 to 1.0.0. <details> <summary>Release notes</summary> *Sourced from [smallvec's releases](https://github.com/servo/rust-smallvec/releases).* > ## v1.0.0 > * Requires Rust 1.36 or later. > * [breaking change] Use `MaybeUninit` to avoid possible undefined behavior ([#162](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/162), [#170](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/170)). > * [breaking change] The `drain` method now takes a range argument, just like the standard `Vec::drain` ([#145](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/145)). > * [breaking change] Remove the `unreachable` function and replace it with the new standard `unreachable_unchecked` function ([#164](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/164)). > * [breaking change] Use `no_std` by default. This crate depends only on `core` and `alloc` by default. If the optional `write` feature is enabled then it depends on `std` so that `SmallVec<[u8;_]>` can implement the `std::io::Write` trait ([#173](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/173)). > * [breaking change] Remove the deprecated `VecLike` trait ([#165](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/165)). > * Add support for 96-element small vectors, `SmallVec<[T; 96]>` ([#163](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/163)). > * Iterators now implement `FusedIterator` ([#172](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/172)). > * Indexing now uses the standard `SliceIndex` trait ([#166](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/166)). > * Add automatic fuzz testing and MIRI testing ([#168](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/168), [#162](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/162)). > * Update syntax and formatting to Rust 2018 standard ([#174](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/174), [#167](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/167)). > </details> <details> <summary>Commits</summary> - [`34c2628`](servo/rust-smallvec@34c2628) Auto merge of [#175](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/175) - mbrubeck:one, r=jdm - [`523a6dc`](servo/rust-smallvec@523a6dc) Version 1.0.0 - [`a2c0504`](servo/rust-smallvec@a2c0504) Auto merge of [#174](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/174) - mbrubeck:2018, r=jdm - [`a51059c`](servo/rust-smallvec@a51059c) Update to Rust 2018 edition - [`01917a6`](servo/rust-smallvec@01917a6) Auto merge of [#168](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/168) - dpc:fuzz, r=mbrubeck - [`a3ba738`](servo/rust-smallvec@a3ba738) Add a fake stub input case for afl fuzzer - [`85c54a5`](servo/rust-smallvec@85c54a5) Add simple fuzzing - [`b2c9c65`](servo/rust-smallvec@b2c9c65) Auto merge of [#173](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/173) - mbrubeck:std, r=emilio - [`fffb185`](servo/rust-smallvec@fffb185) Use no_std by default - [`af73fbd`](servo/rust-smallvec@af73fbd) Auto merge of [#172](https://github-redirect.dependabot.com/servo/rust-smallvec/issues/172) - mbrubeck:fused, r=mbrubeck - Additional commits viewable in [compare view](servo/rust-smallvec@v0.6.13...v1.0.0) </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=smallvec&package-manager=cargo&previous-version=0.6.13&new-version=1.0.0)](https://dependabot.com/compatibility-score.html?dependency-name=smallvec&package-manager=cargo&previous-version=0.6.13&new-version=1.0.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Add examples as a doc to learn Wasmer

Fix emscripten setup, nginx works

cbe0b9b

lachlansneff requested a review from bjfish February 8, 2019 18:31

Merge branch 'master' into fix/emscripten

79ad7c1

xmclark approved these changes Feb 8, 2019

View reviewed changes

bjfish reviewed Feb 8, 2019

View reviewed changes

lib/emscripten/src/lib.rs Outdated Show resolved Hide resolved

bjfish approved these changes Feb 8, 2019

View reviewed changes

lachlansneff added 3 commits February 8, 2019 10:39

Remove commented-out code

f3a2778

Merge branch 'fix/emscripten' of github.com:wasmerio/wasmer into fix/…

a316a11

…emscripten

Re-enable nginx integration test

a052a4f

lachlansneff merged commit 4e1bc48 into master Feb 8, 2019

lachlansneff deleted the fix/emscripten branch February 8, 2019 18:55

nlewycky pushed a commit that referenced this pull request Aug 13, 2020

Merge pull request #165 from wasmerio/test-examples

1454722

Add examples as a doc to learn Wasmer

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix emscripten setup, nginx works #165

Fix emscripten setup, nginx works #165

lachlansneff commented Feb 8, 2019

xmclark Feb 8, 2019

xmclark commented Feb 8, 2019

bjfish Feb 8, 2019

lachlansneff Feb 8, 2019

Fix emscripten setup, nginx works #165

Fix emscripten setup, nginx works #165

Conversation

lachlansneff commented Feb 8, 2019

xmclark Feb 8, 2019

Choose a reason for hiding this comment

xmclark commented Feb 8, 2019

bjfish Feb 8, 2019

Choose a reason for hiding this comment

lachlansneff Feb 8, 2019

Choose a reason for hiding this comment