From 57d4a076cb7c779b7b01eabf7a17a58f0f160b48 Mon Sep 17 00:00:00 2001 From: Mark McCaskey Date: Fri, 13 Mar 2020 16:30:50 -0700 Subject: [PATCH 1/2] Update Rust version in CI to 1.41.1 --- CHANGELOG.md | 1 + azure-pipelines.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38fab56b2..fcfbd3eab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## **[Unreleased]** +- [#1301](https://github.com/wasmerio/wasmer/pull/1301) Update supported stable Rust version to 1.41.1. - [#1285](https://github.com/wasmerio/wasmer/pull/1285) Greatly improve errors in `wasmer-interface-types` - [#1283](https://github.com/wasmerio/wasmer/pull/1283) Workaround for floating point arguments and return values in `DynamicFunc`s. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 07f720e86..8665c1dba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: - script: cargo fmt --all -- --check displayName: Lint variables: - rust_toolchain: '1.40.0' + rust_toolchain: '1.41.1' - job: clippy_lint pool: @@ -55,7 +55,7 @@ jobs: CARGO_HTTP_CHECK_REVOKE: false windows: imageName: "vs2017-win2016" - rust_toolchain: '1.40.0' + rust_toolchain: '1.41.1' pool: vmImage: $(imageName) condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying') @@ -114,7 +114,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: 10.10 windows: imageName: "vs2017-win2016" - rust_toolchain: '1.40.0' + rust_toolchain: '1.41.1' # RUSTFLAGS: -Ctarget-feature=+crt-static pool: vmImage: $(imageName) @@ -183,7 +183,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: 10.10 windows: imageName: "vs2017-win2016" - rust_toolchain: '1.40.0' + rust_toolchain: '1.41.1' # RUSTFLAGS: -Ctarget-feature=+crt-static pool: vmImage: $(imageName) From 5e2488c1eacd8dc6235ddc4b5f763eec74a224fa Mon Sep 17 00:00:00 2001 From: Syrus Date: Sat, 14 Mar 2020 15:12:18 -0700 Subject: [PATCH 2/2] Fixed lint --- lib/emscripten/src/lib.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs index c4981b305..b19f751d3 100644 --- a/lib/emscripten/src/lib.rs +++ b/lib/emscripten/src/lib.rs @@ -1058,10 +1058,13 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject pub fn nullfunc(ctx: &mut Ctx, _x: u32) { use crate::process::abort_with_message; debug!("emscripten::nullfunc_i {}", _x); - abort_with_message(ctx, "Invalid function pointer. Perhaps this is an invalid value \ + abort_with_message( + ctx, + "Invalid function pointer. Perhaps this is an invalid value \ (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an \ incorrect type, which will fail? (it is worth building your source files with -Werror (\ - warnings are errors), as warnings can indicate undefined behavior which can cause this)"); + warnings are errors), as warnings can indicate undefined behavior which can cause this)", + ); } /// The current version of this crate