Merge branch '0.x' into feature/0.x-nosigint

wasmerio · Aug 19, 2020 · f8d83b1 · f8d83b1
2 parents 2a73c5e + 15e615b
commit f8d83b1
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## **[Unreleased]**
 
+- [#1554](https://github.com/wasmerio/wasmer/pull/1554) Update supported stable Rust version to 1.45.2.
 - [#1552](https://github.com/wasmerio/wasmer/pull/1552) Disable `sigint` handler by default.
 
 ## 0.17.1 - 2020-06-24

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,7 +20,7 @@ jobs:
       - script: cargo fmt --all -- --check
         displayName: Lint
     variables:
-      rust_toolchain: '1.41.1'
+      rust_toolchain: '1.45.2'
 
   - job: clippy_lint
     pool:
@@ -38,31 +38,31 @@ jobs:
       - script: cargo clippy --workspace
         displayName: Clippy Lint
     variables:
-      rust_toolchain: nightly-2019-12-19
+      rust_toolchain: '1.45.2'
 
   - job: Test
     strategy:
       matrix:
         linux:
           poolName: "Azure Pipelines"
           imageName: "ubuntu-16.04"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
         android:
           poolName: "Azure Pipelines"
           imageName: "ubuntu-16.04"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
           ANDROID: true
         mac:
           poolName: "Azure Pipelines"
           imageName: "macos-10.14"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
           # By default schannel checks revocation of certificates unlike some other SSL
           # backends, but we've historically had problems on CI where a revocation
           # server goes down presumably. See #43333 for more info
           CARGO_HTTP_CHECK_REVOKE: false
         arm:
           poolName: "Packet"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
         windows:
           poolName: "Azure Pipelines"
           imageName: "vs2017-win2016"
@@ -105,7 +105,7 @@ jobs:
     pool:
       vmImage: "ubuntu-16.04"
     variables:
-      rust_toolchain: nightly-2019-12-19
+      rust_toolchain: 'nightly-2020-08-18'
     condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
     steps:
       - checkout: self
@@ -125,15 +125,15 @@ jobs:
         linux:
           poolName: "Azure Pipelines"
           imageName: "ubuntu-16.04"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
         mac:
           poolName: "Azure Pipelines"
           imageName: "macos-10.14"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
           MACOSX_DEPLOYMENT_TARGET: 10.10
         arm:
           poolName: "Packet"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
         windows:
           poolName: "Azure Pipelines"
           imageName: "vs2017-win2016"
@@ -196,10 +196,10 @@ jobs:
       matrix:
         linux:
           imageName: "ubuntu-16.04"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
         mac:
           imageName: "macos-10.14"
-          rust_toolchain: nightly-2019-12-19
+          rust_toolchain: '1.45.2'
           MACOSX_DEPLOYMENT_TARGET: 10.10
         windows:
           imageName: "vs2017-win2016"
@@ -253,7 +253,7 @@ jobs:
     pool:
       vmImage: "ubuntu-16.04"
     variables:
-      rust_toolchain: nightly-2019-12-19
+      rust_toolchain: '1.45.2'
     condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
     steps:
       - checkout: self

diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml
@@ -12,8 +12,8 @@ readme = "README.md"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.17.1" }
-dynasm = "0.5"
-dynasmrt = "0.5"
+dynasm = "1.0"
+dynasmrt = "1.0"
 lazy_static = "1.4"
 byteorder = "1.3"
 nix = "0.15"

diff --git a/lib/singlepass-backend/src/lib.rs b/lib/singlepass-backend/src/lib.rs
@@ -7,7 +7,6 @@
     unused_unsafe,
     unreachable_patterns
 )]
-#![feature(proc_macro_hygiene)]
 #![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")]
 #![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")]