Merge branch 'master' into f30

.gitignore

@@ -269,3 +269,4 @@
 /rust-1.42.0-powerpc64-unknown-linux-gnu.tar.xz
 /rust-1.42.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.42.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.43.1-src.tar.xz

rust-pr71782-Use-a-non-existent-test-path.patch

@@ -0,0 +1,56 @@
+From fbd3fbdb24563a9d8fd3651f6bdc90bbbbd81d3e Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Fri, 1 May 2020 16:50:10 -0700
+Subject: [PATCH] Use a non-existent test path instead of clobbering /dev/null
+
+---
+ src/test/ui/non-ice-error-on-worker-io-fail.rs     | 10 +++++++---
+ src/test/ui/non-ice-error-on-worker-io-fail.stderr |  2 +-
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.rs b/src/test/ui/non-ice-error-on-worker-io-fail.rs
+index 8af17742850d..30779fc65c0f 100644
+--- a/src/test/ui/non-ice-error-on-worker-io-fail.rs
++++ b/src/test/ui/non-ice-error-on-worker-io-fail.rs
+@@ -4,8 +4,12 @@
+ //
+ // An attempt to `-o` into a directory we cannot write into should indeed
+ // be an error; but not an ICE.
++//
++// However, some folks run tests as root, which can write `/dev/` and end
++// up clobbering `/dev/null`. Instead we'll use a non-existent path, which
++// also used to ICE, but even root can't magically write there.
+ 
+-// compile-flags: -o /dev/null
++// compile-flags: -o /does-not-exist/output
+ 
+ // The error-pattern check occurs *before* normalization, and the error patterns
+ // are wildly different between build environments. So this is a cop-out (and we
+@@ -15,10 +19,10 @@
+ // error-pattern: error
+ 
+ // On Mac OS X, we get an error like the below
+-// normalize-stderr-test "failed to write bytecode to /dev/null.non_ice_error_on_worker_io_fail.*" -> "io error modifying /dev/"
++// normalize-stderr-test "failed to write bytecode to /does-not-exist/output.non_ice_error_on_worker_io_fail.*" -> "io error modifying /does-not-exist/"
+ 
+ // On Linux, we get an error like the below
+-// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /dev/"
++// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /does-not-exist/"
+ 
+ // ignore-tidy-linelength
+ // ignore-windows - this is a unix-specific test
+diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.stderr b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
+index f732abc52b71..edadecf273a7 100644
+--- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr
++++ b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
+@@ -1,6 +1,6 @@
+ warning: ignoring --out-dir flag due to -o flag
+ 
+-error: io error modifying /dev/
++error: io error modifying /does-not-exist/
+ 
+ error: aborting due to previous error
+ 
+-- 
+2.26.2
+

rust.spec

@@ -48,7 +48,7 @@
 %endif
 
 Name:           rust
-Version:        1.43.0
+Version:        1.43.1
 Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
@@ -77,6 +77,9 @@ Patch3:         rust-pr70591-ensure-llvm-is-in-the-link-path.patch
 # https://github.com/rust-lang/rust/pull/70163
 Patch4:         rust-pr70163-prepare-for-llvm-10-upgrade.patch
 
+# https://github.com/rust-lang/rust/pull/71782
+Patch5:         rust-pr71782-Use-a-non-existent-test-path.patch
+
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -409,6 +412,7 @@ test -f '%{local_rust_root}/bin/rustc'
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
@@ -714,6 +718,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Thu May 07 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1
+- Update to 1.43.1.
+
 * Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 1.43.0-1
 - Update to 1.43.0.
 

sources

@@ -1 +1 @@
-SHA512 (rustc-1.43.0-src.tar.xz) = dbff18567f2971da4eb13c670c30b136757692df1bc5024cdc0406f3c30574d3485fd616724987bcc765bc5f64c8ed5026f0e96f11eacb035e00256ed190b4f3
+SHA512 (rustc-1.43.1-src.tar.xz) = 24bb01237b1f3f5412109290bb4406b9742cf8956162f4090a98ed3a59a6e2e8dda399452bec1c93c8afdcf5effd98e4825e7f218238e0e88735c1ff4a5b385f

sources-bootstrap

@@ -1,4 +1,4 @@
-SHA512 (rustc-1.43.0-src.tar.xz) = dbff18567f2971da4eb13c670c30b136757692df1bc5024cdc0406f3c30574d3485fd616724987bcc765bc5f64c8ed5026f0e96f11eacb035e00256ed190b4f3
+SHA512 (rustc-1.43.1-src.tar.xz) = 24bb01237b1f3f5412109290bb4406b9742cf8956162f4090a98ed3a59a6e2e8dda399452bec1c93c8afdcf5effd98e4825e7f218238e0e88735c1ff4a5b385f
 SHA512 (rust-1.42.0-aarch64-unknown-linux-gnu.tar.xz) = 691a11e279efdcafa6bdafacb7fb48ccf653e180e0e85909b6031105a297d47538efb36d63216f6185427f818483a51aa827f351ca2123840d72caf60079fe13
 SHA512 (rust-1.42.0-armv7-unknown-linux-gnueabihf.tar.xz) = 26768ec530506e20fed8f9ef2c1ca85eec155fc90949f2063836b6109b296a976c8430a698971a8b1c11e8f6ad043d854a36e9f0e849417178411dc5cbd30e59
 SHA512 (rust-1.42.0-i686-unknown-linux-gnu.tar.xz) = 7376be5abed573bbf68f73ed5609fa8e22dfa3ead19a3f3d78d553347e3ae01604ab9906f5317f1687a8ab3f9ad9c38cde44ef6f56d7da65a788a74aee9df057