lang/rust: Update to 1.42.0

- Force rebuild all consumers to catch regressions early

Changes:	https://blog.rust-lang.org/2020/03/12/Rust-1.42.html
Tested by:	mikael, tobik
With hat:	rust
Differential Revision:	https://reviews.freebsd.org/D24020

5 files changed, 65 insertions, 72 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 10808fd64378..27554c6eea3b 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.41.1
+PORTVERSION?=	1.42.0
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
@@ -62,9 +62,9 @@ WASM_VARS_OFF=		_RUST_BUILD_WASM=false
 WASM_VARS=		_RUST_BUILD_WASM=true
 
 # See WRKSRC/src/stage0.txt for the date and version values.
-BOOTSTRAPS_DATE?=		2020-01-11
-RUST_BOOTSTRAP_VERSION?=	1.40.0
-CARGO_BOOTSTRAP_VERSION?=	0.41.0
+BOOTSTRAPS_DATE?=		2020-02-29
+RUST_BOOTSTRAP_VERSION?=	1.41.1
+CARGO_BOOTSTRAP_VERSION?=	0.42.0
 
 BOOTSTRAPS_SUFFIX?=		${BOOTSTRAPS_SUFFIX_${ARCH}}
 BOOTSTRAPS_SUFFIX_powerpc64?=	-${PPC_ABI:tl}
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index b019d351affa..f45e02a85fc5 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,45 +1,45 @@
-TIMESTAMP = 1582642993
-SHA256 (rust/rustc-1.41.1-src.tar.xz) = ebac9861b43c7207af36e24402dfdc5463a4df4bdb015ccb2b165251c0fdcf7c
-SIZE (rust/rustc-1.41.1-src.tar.xz) = 93754192
-SHA256 (rust/2020-01-11/rustc-1.40.0-aarch64-unknown-freebsd.tar.xz) = b73372fb30198cd9c26927f89cc96c339253038491fcb5629d88285f156f1347
-SIZE (rust/2020-01-11/rustc-1.40.0-aarch64-unknown-freebsd.tar.xz) = 26371388
-SHA256 (rust/2020-01-11/rust-std-1.40.0-aarch64-unknown-freebsd.tar.xz) = 88abe2b1e267309bc87bb0bf9ace0c7d72be21c47a0fec9858364f1ed6cd64f9
-SIZE (rust/2020-01-11/rust-std-1.40.0-aarch64-unknown-freebsd.tar.xz) = 13924444
-SHA256 (rust/2020-01-11/cargo-0.41.0-aarch64-unknown-freebsd.tar.xz) = 492827650d0cf0b796008bbc40d01fa9bbba86c542b3b84d213c6b87a4736261
-SIZE (rust/2020-01-11/cargo-0.41.0-aarch64-unknown-freebsd.tar.xz) = 3722100
-SHA256 (rust/2020-01-11/rustc-1.40.0-x86_64-unknown-freebsd.tar.xz) = e95b3c7c0fec14fb9efd23155812c61bae08e1513fb62cd15fca30fafec7cd5e
-SIZE (rust/2020-01-11/rustc-1.40.0-x86_64-unknown-freebsd.tar.xz) = 28440532
-SHA256 (rust/2020-01-11/rust-std-1.40.0-x86_64-unknown-freebsd.tar.xz) = f5aa2fddf200a701eee4fcebe43725e77333283d7714a273ae92c06de3601a9a
-SIZE (rust/2020-01-11/rust-std-1.40.0-x86_64-unknown-freebsd.tar.xz) = 14603276
-SHA256 (rust/2020-01-11/cargo-0.41.0-x86_64-unknown-freebsd.tar.xz) = 629de6db56cd659856a28679be68dfadbdb31a28a65c156d65cec769ff43a7e7
-SIZE (rust/2020-01-11/cargo-0.41.0-x86_64-unknown-freebsd.tar.xz) = 4399816
-SHA256 (rust/2020-01-11/rustc-1.40.0-armv6-unknown-freebsd.tar.xz) = 442dc33f751c79044d862d4d20e6512589d78e33712c8731b83e7b9ccded9f01
-SIZE (rust/2020-01-11/rustc-1.40.0-armv6-unknown-freebsd.tar.xz) = 27455140
-SHA256 (rust/2020-01-11/rust-std-1.40.0-armv6-unknown-freebsd.tar.xz) = bdcf05cafe9a6a5fd1d089b763cd4946d24a61049f24eff3993c1033db4af88e
-SIZE (rust/2020-01-11/rust-std-1.40.0-armv6-unknown-freebsd.tar.xz) = 13924280
-SHA256 (rust/2020-01-11/cargo-0.41.0-armv6-unknown-freebsd.tar.xz) = d04aba96a043fb798cee1f4b44a63ff83549c1c85ffaadbbda3edc28ebbb01fc
-SIZE (rust/2020-01-11/cargo-0.41.0-armv6-unknown-freebsd.tar.xz) = 3811020
-SHA256 (rust/2020-01-11/rustc-1.40.0-armv7-unknown-freebsd.tar.xz) = 9d89a89d0f441e1e074e2d0c9d255e07852971c60bd3f4e533e8d1e9fded60e0
-SIZE (rust/2020-01-11/rustc-1.40.0-armv7-unknown-freebsd.tar.xz) = 27393212
-SHA256 (rust/2020-01-11/rust-std-1.40.0-armv7-unknown-freebsd.tar.xz) = 5e4ef87f5403f273856ecfcb822d439628fc95dd7c77d2bd21ac7f33b7e4cba6
-SIZE (rust/2020-01-11/rust-std-1.40.0-armv7-unknown-freebsd.tar.xz) = 13862568
-SHA256 (rust/2020-01-11/cargo-0.41.0-armv7-unknown-freebsd.tar.xz) = a07620fe97be95523d3f915ae03c4b37fcd467fd4f141d62188670dd069e98a2
-SIZE (rust/2020-01-11/cargo-0.41.0-armv7-unknown-freebsd.tar.xz) = 3808576
-SHA256 (rust/2020-01-11/rustc-1.40.0-i686-unknown-freebsd.tar.xz) = a785bede5f78784a62e5b93557e46fed32263d0625e3abe186847f9d6bee89aa
-SIZE (rust/2020-01-11/rustc-1.40.0-i686-unknown-freebsd.tar.xz) = 29109748
-SHA256 (rust/2020-01-11/rust-std-1.40.0-i686-unknown-freebsd.tar.xz) = d44c08d8bc59eec45784c5dd53d5b5a723afa0786a33e52e23a3a169c932242d
-SIZE (rust/2020-01-11/rust-std-1.40.0-i686-unknown-freebsd.tar.xz) = 14501104
-SHA256 (rust/2020-01-11/cargo-0.41.0-i686-unknown-freebsd.tar.xz) = e4360a14e9b7bf24c273d72a0f043f276be8500974d8c00df9eb2b56abff5ae3
-SIZE (rust/2020-01-11/cargo-0.41.0-i686-unknown-freebsd.tar.xz) = 4356888
-SHA256 (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = b68ce52ccf2a04d165ac0cc69e6eb6dd1d4b69c5334c7e20e1ada9387f34d788
-SIZE (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 32015204
-SHA256 (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 9193a9c30fe63f8d0644c99be9c253dc0e685d994812bc22a2e35c8046a64430
-SIZE (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 13903088
-SHA256 (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e434e724c635aadac3bd859b49504903133182fca862bdc1c2129659e2129cdd
-SIZE (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4253612
-SHA256 (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 7ef1dcdf471b5ff8fdb106573594589978d96c39931972750e21bd4ab001e856
-SIZE (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 26694028
-SHA256 (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 8dfaff61d5d631afb04cd7a6235dfac3a803fa1fd13def934746e69b6ec35b38
-SIZE (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 13866172
-SHA256 (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 10e96fb30baa14a95ffede8074867209feda189af2b49f5da1caf5457c9751b2
-SIZE (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3982652
+TIMESTAMP = 1583854644
+SHA256 (rust/rustc-1.42.0-src.tar.xz) = aa5b4c0f2bac33cc26a11523fce9b0f120d2eff510ed148ae7c586501481ed04
+SIZE (rust/rustc-1.42.0-src.tar.xz) = 94186592
+SHA256 (rust/2020-02-29/rustc-1.41.1-aarch64-unknown-freebsd.tar.xz) = 450b9870656a3cc76385dc6fb3347d4192f4a75c09644d22d73641016e47ae34
+SIZE (rust/2020-02-29/rustc-1.41.1-aarch64-unknown-freebsd.tar.xz) = 25741844
+SHA256 (rust/2020-02-29/rust-std-1.41.1-aarch64-unknown-freebsd.tar.xz) = 768483484e03449718098d71d2df49859498dd089da0fbba93839490922a9f89
+SIZE (rust/2020-02-29/rust-std-1.41.1-aarch64-unknown-freebsd.tar.xz) = 13184164
+SHA256 (rust/2020-02-29/cargo-0.42.0-aarch64-unknown-freebsd.tar.xz) = 9a2327bc426e1524c62626845330bf0e38bd592bbc51c046848459b941adc948
+SIZE (rust/2020-02-29/cargo-0.42.0-aarch64-unknown-freebsd.tar.xz) = 3768016
+SHA256 (rust/2020-02-29/rustc-1.41.1-x86_64-unknown-freebsd.tar.xz) = 183bcbda3a19fb3c6be81082ed422dd97c7a8d3a4a8370268d8a8474278b9637
+SIZE (rust/2020-02-29/rustc-1.41.1-x86_64-unknown-freebsd.tar.xz) = 28096624
+SHA256 (rust/2020-02-29/rust-std-1.41.1-x86_64-unknown-freebsd.tar.xz) = 28bccebc5c0bff25ffc63850d5b19ff316d6552f843bb14936f7538f1a3ea5d4
+SIZE (rust/2020-02-29/rust-std-1.41.1-x86_64-unknown-freebsd.tar.xz) = 13800276
+SHA256 (rust/2020-02-29/cargo-0.42.0-x86_64-unknown-freebsd.tar.xz) = 4a55196e0853ba57e793cc67c85e9ae06ec2ad6cf5c3545bfd2d89abc5362825
+SIZE (rust/2020-02-29/cargo-0.42.0-x86_64-unknown-freebsd.tar.xz) = 4397816
+SHA256 (rust/2020-02-29/rustc-1.41.1-armv6-unknown-freebsd.tar.xz) = 64fc2601a9047f8605183a5f5e0870ec776e84c3a01fdca179af1d799e7ec5f8
+SIZE (rust/2020-02-29/rustc-1.41.1-armv6-unknown-freebsd.tar.xz) = 26932384
+SHA256 (rust/2020-02-29/rust-std-1.41.1-armv6-unknown-freebsd.tar.xz) = 8cd6b1f6d18c853f739438df3ee1aa45d0e904b19d01db034935267b6a7cf3d1
+SIZE (rust/2020-02-29/rust-std-1.41.1-armv6-unknown-freebsd.tar.xz) = 13197644
+SHA256 (rust/2020-02-29/cargo-0.42.0-armv6-unknown-freebsd.tar.xz) = 6af958f17914f4ca317613745f2f53fba8e7d92160d7f9cec75c0992e6504a9c
+SIZE (rust/2020-02-29/cargo-0.42.0-armv6-unknown-freebsd.tar.xz) = 3826200
+SHA256 (rust/2020-02-29/rustc-1.41.1-armv7-unknown-freebsd.tar.xz) = 24d2603a1191e88f32caff98c0f30e1c0a19fc58a894fbf28e298e9753c4ed24
+SIZE (rust/2020-02-29/rustc-1.41.1-armv7-unknown-freebsd.tar.xz) = 26889080
+SHA256 (rust/2020-02-29/rust-std-1.41.1-armv7-unknown-freebsd.tar.xz) = ef5b70ee1f2f5ff5368431301d9983ae1675f02f675dbdd0c4cd238874541661
+SIZE (rust/2020-02-29/rust-std-1.41.1-armv7-unknown-freebsd.tar.xz) = 13115476
+SHA256 (rust/2020-02-29/cargo-0.42.0-armv7-unknown-freebsd.tar.xz) = c12d407e33a106ce370468f4e71cf4ca73ed5dc32fc295dcbd23340b8486832d
+SIZE (rust/2020-02-29/cargo-0.42.0-armv7-unknown-freebsd.tar.xz) = 3820132
+SHA256 (rust/2020-02-29/rustc-1.41.1-i686-unknown-freebsd.tar.xz) = 9192ae6f5cff5afd7d29686694e72e1618ec9f973e29c89a267a399097d893d9
+SIZE (rust/2020-02-29/rustc-1.41.1-i686-unknown-freebsd.tar.xz) = 28774560
+SHA256 (rust/2020-02-29/rust-std-1.41.1-i686-unknown-freebsd.tar.xz) = 0416b5b7a1c6d22101802f246ef760d856d589d0f2f73898df8f1b46b4d37d43
+SIZE (rust/2020-02-29/rust-std-1.41.1-i686-unknown-freebsd.tar.xz) = 13670064
+SHA256 (rust/2020-02-29/cargo-0.42.0-i686-unknown-freebsd.tar.xz) = 64fc4a4418d96e20bc83abc38c76f3212ae6643bcd039db1dc05aacb596dc98e
+SIZE (rust/2020-02-29/cargo-0.42.0-i686-unknown-freebsd.tar.xz) = 4416360
+SHA256 (rust/2020-02-29/rustc-1.41.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 3f81c55a6865da252a7184af48878c0eedf65f3c5075b019619380d26ee05f9f
+SIZE (rust/2020-02-29/rustc-1.41.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 31564236
+SHA256 (rust/2020-02-29/rust-std-1.41.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 544eb40644658cb6319d3b012881b062f68474d28f441100b7aa9b2f31c7eda7
+SIZE (rust/2020-02-29/rust-std-1.41.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 13163336
+SHA256 (rust/2020-02-29/cargo-0.42.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5a1d8683c2327305ddb5f0a2a794325b09e904451bf74c6e8aa8e8ec925eec57
+SIZE (rust/2020-02-29/cargo-0.42.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4246988
+SHA256 (rust/2020-02-29/rustc-1.41.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 08023a907b3e69dd4689f174dd2da7e654324a35ecfc522db31d7aa9e049520d
+SIZE (rust/2020-02-29/rustc-1.41.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 26407348
+SHA256 (rust/2020-02-29/rust-std-1.41.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 008e9e8426fe4f82d9b950ea325aaeaecf6b182ce061a39ebfbf3b2d9263ab16
+SIZE (rust/2020-02-29/rust-std-1.41.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 13116720
+SHA256 (rust/2020-02-29/cargo-0.42.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = a1010a8fb3e2d635f2fd81999fe2309120da9ec4db4aacb3b6e9cb8bd0a79736
+SIZE (rust/2020-02-29/cargo-0.42.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4025124
diff --git a/lang/rust/files/patch-src_bootstrap_native.rs b/lang/rust/files/patch-src_bootstrap_native.rs
index b160c5fa94b2..433833a4a5af 100644
--- a/lang/rust/files/patch-src_bootstrap_native.rs
+++ b/lang/rust/files/patch-src_bootstrap_native.rs
@@ -3,11 +3,11 @@ for building rust-lld.  Attempt to improve reliability of the build
 by not using it.  llvm-config-wrapper is a hack in the first place
 that is only really needed on Windows.
 
---- src/bootstrap/native.rs.orig	2020-03-01 09:54:42 UTC
+--- src/bootstrap/native.rs.orig	2020-02-27 18:39:49 UTC
 +++ src/bootstrap/native.rs
-@@ -472,27 +472,9 @@ impl Step for Lld {
+@@ -467,25 +467,9 @@ impl Step for Lld {
          let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld"));
-         configure_cmake(builder, target, &mut cfg);
+         configure_cmake(builder, target, &mut cfg, true);
  
 -        // This is an awful, awful hack. Discovered when we migrated to using
 -        // clang-cl to compile LLVM/LLD it turns out that LLD, when built out of
@@ -23,14 +23,12 @@ that is only really needed on Windows.
 -        // ensure we don't hit the same bugs with escaping. It means that you
 -        // can't build on a system where your paths require `\` on Windows, but
 -        // there's probably a lot of reasons you can't do that other than this.
--        let llvm_config_shim = env::current_exe()
--            .unwrap()
--            .with_file_name("llvm-config-wrapper");
+-        let llvm_config_shim = env::current_exe().unwrap().with_file_name("llvm-config-wrapper");
          cfg.out_dir(&out_dir)
-            .profile("Release")
--           .env("LLVM_CONFIG_REAL", llvm_config)
--           .define("LLVM_CONFIG_PATH", llvm_config_shim)
-+           .define("LLVM_CONFIG_PATH", llvm_config)
-            .define("LLVM_INCLUDE_TESTS", "OFF");
+             .profile("Release")
+-            .env("LLVM_CONFIG_REAL", llvm_config)
+-            .define("LLVM_CONFIG_PATH", llvm_config_shim)
++            .define("LLVM_CONFIG_PATH", llvm_config)
+             .define("LLVM_INCLUDE_TESTS", "OFF");
  
          cfg.build();
diff --git a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs b/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
index 33e329ba2a56..75c659e6501d 100644
--- a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
+++ b/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
@@ -1,16 +1,11 @@
---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2019-12-16 15:38:05 UTC
+--- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2020-01-23 19:40:44 UTC
 +++ src/librustc_target/spec/i686_unknown_freebsd.rs
-@@ -2,9 +2,11 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
+@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
  
  pub fn target() -> TargetResult {
      let mut base = super::freebsd_base::opts();
 -    base.cpu = "pentium4".to_string();
 +    base.cpu = "pentiumpro".to_string();
      base.max_atomic_width = Some(64);
--    base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string());
-+    let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap();
-+    pre_link_args.push("-m32".to_string());
-+    pre_link_args.push("-Wl,-znotext".to_string());
-     base.stack_probes = true;
- 
-     Ok(Target {
+     let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap();
+     pre_link_args.push("-m32".to_string());
diff --git a/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs b/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs
index bc48318fa83e..fb4f9c166579 100644
--- a/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs
+++ b/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs
@@ -1,11 +1,11 @@
---- src/librustc_target/abi/call/powerpc64.rs.orig	2019-09-23 21:15:52 UTC
+--- src/librustc_target/abi/call/powerpc64.rs.orig	2020-03-09 22:11:17 UTC
 +++ src/librustc_target/abi/call/powerpc64.rs
-@@ -128,7 +128,7 @@ pub fn compute_abi_info<'a, Ty, C>(cx: &C, fty: &mut F
+@@ -123,7 +123,7 @@ where
          ELFv2
      } else {
          match cx.data_layout().endian {
 -            Endian::Big => ELFv1,
 +            Endian::Big => ELFv2,
-             Endian::Little => ELFv2
+             Endian::Little => ELFv2,
          }
      };