Merge branch 'rust' into 'master'

Rust bump

Builds on pmmx/x86_64/ppc64/aarch64. Successfully builds Firefox.

Still fails 17 tests on ppc32, but the ICE has been fixed:

```
    [run-make] run-make-fulldeps/exit-code
    [run-make] run-make-fulldeps/extern-fn-generic
    [run-make] run-make-fulldeps/extern-fn-struct-passing-abi
    [run-make] run-make-fulldeps/extern-fn-with-packed-struct
    [run-make] run-make-fulldeps/extern-fn-with-union
    [run-make] run-make-fulldeps/issue-25581
    [run-make] run-make-fulldeps/relocation-model
    [run-pass] run-pass/extern/extern-pass-TwoU16s.rs
    [run-pass] run-pass/extern/extern-pass-TwoU32s.rs
    [run-pass] run-pass/extern/extern-pass-TwoU64s.rs
    [run-pass] run-pass/extern/extern-pass-TwoU8s.rs
    [run-pass] run-pass/extern/extern-pass-empty.rs
    [run-pass] run-pass/foreign/foreign-fn-with-byval.rs
    [run-pass] run-pass/issues/issue-28676.rs
    [run-pass] run-pass/structs-enums/struct-return.rs
    [run-pass] run-pass/threads-sendsync/thread-local-extern-static.rs
    [run-pass] run-pass/union/union-c-interop.rs
```

See merge request !232

1 files changed, 6 insertions, 6 deletions

diff --git a/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
index 6435eeef0..b8fa40308 100644
--- a/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+++ b/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
@@ -1,25 +1,25 @@
-From e60db771c8ffe7b82a97ca516737cbf40b372e54 Mon Sep 17 00:00:00 2001
+From cd7484e89d44ad980a526eb993c5cbc2b7f0878a Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 16 Sep 2018 16:40:04 +0000
-Subject: [PATCH 07/14] runtest: Fix proc-macro tests on musl hosts
+Subject: [PATCH 07/13] runtest: Fix proc-macro tests on musl hosts
 
 ---
  src/tools/compiletest/src/runtest.rs | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
-index 400c205d44..be5c50b070 100644
+index 2021dd513a..765353620b 100644
 --- a/src/tools/compiletest/src/runtest.rs
 +++ b/src/tools/compiletest/src/runtest.rs
-@@ -1566,7 +1566,6 @@ impl<'test> TestCx<'test> {
+@@ -1605,7 +1605,6 @@ impl<'test> TestCx<'test> {
                  None
              } else if self.config.target.contains("cloudabi")
                  || self.config.target.contains("emscripten")
 -                || (self.config.target.contains("musl") && !aux_props.force_host)
                  || self.config.target.contains("wasm32")
+                 || self.config.target.contains("nvptx")
              {
-                 // We primarily compile all auxiliary libraries as dynamic libraries
-@@ -1574,10 +1573,8 @@ impl<'test> TestCx<'test> {
+@@ -1614,10 +1613,8 @@ impl<'test> TestCx<'test> {
                  // for the test suite (otherwise including libstd statically in all
                  // executables takes up quite a bit of space).
                  //