[tbb-commits] [tor-browser-build/master] Bug 40133: Bump Rust version for ESR 78 to 1.43.0

[sysrqb at torproject.org]

commit 79e1bd00f2e2cc35e0670b30c649eb5c4b24a0ff
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Oct 19 10:57:14 2020 +0000

    Bug 40133: Bump Rust version for ESR 78 to 1.43.0
---
 projects/rust/config       |  4 ++--
 projects/rust/unwind.patch | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/projects/rust/config b/projects/rust/config
index 4d4cd51..af94f05 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -5,8 +5,8 @@ version: '[% c("input_file_var/rust_version") %]'
 # Those values can be changed from the input_files section of other
 # projects. See bug 32436.
 input_file_var:
-  rust_version: 1.41.1
-  prev_version: 1.40.0
+  rust_version: 1.43.0
+  prev_version: 1.42.0
 
 var:
   prev_version: '[% c("input_file_var/prev_version") %]'
diff --git a/projects/rust/unwind.patch b/projects/rust/unwind.patch
index c25d9d2..65c51f9 100644
--- a/projects/rust/unwind.patch
+++ b/projects/rust/unwind.patch
@@ -1,4 +1,4 @@
-From 212ea02a0743a3bd4fcab1288682d3d780da960b Mon Sep 17 00:00:00 2001
+From 90ddcca6235b5f24c57df6a648e8d489c7e3eae5 Mon Sep 17 00:00:00 2001
 From: Bjorn Neergaard <bjorn at neersighted.com>
 Date: Sat, 9 Feb 2019 19:39:23 +0000
 Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux
@@ -32,10 +32,10 @@ rethinking of how iOS is special-cased above, to avoid further
 duplication. Input on how to best structure this file is requested.
 
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 831053bc0f7..13ec5da3e3d 100644
+index 65a00db3394..e821507c341 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -208,6 +208,11 @@ pub fn std_cargo(builder: &Builder<'_>,
+@@ -207,6 +207,11 @@ pub fn std_cargo(builder: &Builder<'_>, target: Interned<String>, cargo: &mut Ca
          let mut features = builder.std_features();
          features.push_str(&compiler_builtins_c_feature);
  
@@ -44,14 +44,14 @@ index 831053bc0f7..13ec5da3e3d 100644
 +            features.push_str(" sjlj_eh");
 +        }
 +
-         if compiler.stage != 0 && builder.config.sanitizers {
-             // This variable is used by the sanitizer runtime crates, e.g.
-             // rustc_lsan, to build the sanitizer runtime from C code
+         cargo
+             .arg("--features")
+             .arg(features)
 diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
-index a22e162bbff..e1c8f164916 100644
+index b147aa55b2a..cad4d88caa2 100644
 --- a/src/libstd/Cargo.toml
 +++ b/src/libstd/Cargo.toml
-@@ -78,6 +78,7 @@ panic_immediate_abort = ["core/panic_immediate_abort"]
+@@ -68,6 +68,7 @@ panic_immediate_abort = ["core/panic_immediate_abort"]
  # https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.toml
  std_detect_file_io = []
  std_detect_dlsym_getauxval = []
@@ -78,12 +78,12 @@ index 77bcfffd506..9d9fc5fbff5 100644
  llvm-libunwind = []
 +sjlj_eh = []
 diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs
-index 0b39503c0d0..ec8681c2985 100644
+index 0c57861f70a..44c767ebfc5 100644
 --- a/src/libunwind/libunwind.rs
 +++ b/src/libunwind/libunwind.rs
-@@ -74,8 +74,8 @@ pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reaso
-                any(target_os = "fuchsia", target_os = "linux")),
-            link(name = "unwind", kind = "static"))]
+@@ -79,8 +79,8 @@ pub type _Unwind_Exception_Cleanup_Fn =
+     link(name = "unwind", kind = "static")
+ )]
  extern "C" {
 -    #[unwind(allowed)]
 -    pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !;
@@ -92,7 +92,7 @@ index 0b39503c0d0..ec8681c2985 100644
      pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception);
      pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void;
      pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr;
-@@ -216,32 +216,50 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
+@@ -222,32 +222,50 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
  } // cfg_if!
  
  cfg_if::cfg_if! {
@@ -159,5 +159,5 @@ index 0b39503c0d0..ec8681c2985 100644
  } // cfg_if!
  
 -- 
-2.27.0
+2.28.0