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, 15 insertions, 20 deletions

diff --git a/user/rust/0040-rls-atomics.patch b/user/rust/0040-rls-atomics.patch
index 4dd813faa..d9aedb9af 100644
--- a/user/rust/0040-rls-atomics.patch
+++ b/user/rust/0040-rls-atomics.patch
@@ -1,17 +1,15 @@
-diff --git a/src/tools/rls/src/cmd.rs b/src/tools/rls/src/cmd.rs
-index 64035aa..d9129d8 100644
---- a/src/tools/rls/src/cmd.rs
-+++ b/src/tools/rls/src/cmd.rs
-@@ -17,7 +17,7 @@ use crate::config::Config;
+--- rustc-1.35.0-src/src/tools/rls/rls/src/cmd.rs
++++ rustc-1.35.0-src/src/tools/rls/rls/src/cmd.rs
+@@ -7,7 +7,7 @@ use crate::config::Config;
  use crate::server::{self, LsService, Notification, Request, RequestId};
  use rls_analysis::{AnalysisHost, Target};
  use rls_vfs::Vfs;
 -use std::sync::atomic::{AtomicU64, Ordering};
 +use std::sync::atomic::{AtomicU32, Ordering};
  
- use languageserver_types::{
+ use lsp_types::{
      ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem,
-@@ -424,8 +424,8 @@ fn url(file_name: &str) -> Url {
+@@ -313,8 +313,8 @@ fn url(file_name: &str) -> Url {
  }
  
  fn next_id() -> RequestId {
@@ -22,11 +20,9 @@ index 64035aa..d9129d8 100644
  }
  
  // Custom reader and output for the RLS server.
-diff --git a/src/tools/rls/src/server/io.rs b/src/tools/rls/src/server/io.rs
-index 7b93d4a..f3c5361 100644
---- a/src/tools/rls/src/server/io.rs
-+++ b/src/tools/rls/src/server/io.rs
-@@ -17,7 +17,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest};
+--- rustc-1.35.0-src/src/tools/rls/rls/src/server/io.rs
++++ rustc-1.35.0-src/src/tools/rls/rls/src/server/io.rs
+@@ -7,7 +7,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest};
  
  use std::fmt;
  use std::io::{self, BufRead, Write};
@@ -35,7 +31,7 @@ index 7b93d4a..f3c5361 100644
  use std::sync::Arc;
  
  use jsonrpc_core::{self as jsonrpc, response, version, Id};
-@@ -190,14 +190,14 @@ pub trait Output: Sync + Send + Clone + 'static {
+@@ -171,13 +171,13 @@ pub trait Output: Sync + Send + Clone + 'static {
  /// An output that sends notifications and responses on `stdout`.
  #[derive(Clone)]
  pub(super) struct StdioOutput {
@@ -44,15 +40,14 @@ index 7b93d4a..f3c5361 100644
  }
  
  impl StdioOutput {
-     /// Construct a new `stdout` output.
-     crate fn new() -> StdioOutput {
-         StdioOutput {
--            next_id: Arc::new(AtomicU64::new(1)),
-+            next_id: Arc::new(AtomicU32::new(1).into()),
-         }
+     /// Constructs a new `stdout` output.
+     pub(crate) fn new() -> StdioOutput {
+-        StdioOutput { next_id: Arc::new(AtomicU64::new(1)) }
++        StdioOutput { next_id: Arc::new(AtomicU32::new(1).into()) }
      }
  }
-@@ -215,7 +215,7 @@ impl Output for StdioOutput {
+ 
+@@ -194,7 +194,7 @@ impl Output for StdioOutput {
      }
  
      fn provide_id(&self) -> RequestId {