rust: 1.51.0 -> 1.52.0

4 files changed, 30 insertions, 71 deletions

diff --git a/rust/.footprint b/rust/.footprint
index d855f6141..fa1b99c16 100644
--- a/rust/.footprint
+++ b/rust/.footprint
@@ -17,6 +17,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/rustdoc
 -rwxr-xr-x	root/root	usr/bin/rustfmt
 drwxr-xr-x	root/root	usr/lib/
+-rwxr-xr-x	root/root	usr/lib/cargo-credential-1password
 drwxr-xr-x	root/root	usr/lib/rustlib/
 drwxr-xr-x	root/root	usr/lib/rustlib/etc/
 -rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
@@ -70,12 +71,11 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btre
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow/tests.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/fix.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/entry.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/tests.rs
-drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/tests/
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/tests/ord_chaos.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/mem.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/merge_iter.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/mod.rs
@@ -89,6 +89,11 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btre
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/set/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/set/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/split.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/testing/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/testing/crash_test.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/testing/mod.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/testing/ord_chaos.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/testing/rng.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/linked_list.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/linked_list/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/linked_list/tests.rs
@@ -434,6 +439,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/prelude/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/primitive.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/ptr/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ptr/const_ptr.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ptr/metadata.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ptr/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ptr/mut_ptr.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ptr/non_null.rs
@@ -452,6 +458,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/iter/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/raw.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/rotate.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/sort.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/specialize.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/str/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/converts.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/error.rs
@@ -571,6 +578,8 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/flt2dec/str
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/uint_macros.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/wrapping.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/ops.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/tests/ops/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/ops/control_flow.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/option.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/pattern.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/pin.rs
@@ -891,7 +900,6 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/net.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/os.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/path.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/pipe.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/rwlock.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/stack_overflow.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/hermit/stdio.rs
@@ -1004,6 +1012,8 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/p
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_common/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_fuchsia.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_unix.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_unix/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_unix/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/zircon.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/rand.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/rwlock.rs
@@ -1565,7 +1575,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/libunwind_ext.h
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/CMakeLists.txt
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/alignment.pass.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/alignment.compile.pass.cpp
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/frameheadercache_test.pass.cpp
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind/__init__.py (EMPTY)
@@ -1578,7 +1588,9 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/li
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/lit.site.cfg.in
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/remember_state_leak.pass.sh.s
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/signal_frame.pass.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/signal_unwind.pass.cpp
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/unw_getcontext.pass.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/unwind_leaffunction.pass.cpp
 drwxr-xr-x	root/root	usr/lib/rustlib/x86_64-unknown-linux-gnu/
 drwxr-xr-x	root/root	usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/
 -rwxr-xr-x	root/root	usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-llvm-dwp
diff --git a/rust/.signature b/rust/.signature
index f80fffad5..051075b6b 100644
--- a/rust/.signature
+++ b/rust/.signature
@@ -1,11 +1,9 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/f/9W2vKk7Zg/zC8FLrnKTiX6SqyzUTkK9Q6pilhjshT9e19LDrWSxDnOJT+b7Ww3sno3NIVZt32EYq+O1pZ4AE=
-SHA256 (Pkgfile) = b769331fb4fedbdf0ec54b6b1e500ad056da81af851f6fdaf4d6649531aa1055
-SHA256 (.footprint) = f17fdd266ee46f95fe963f63d349fff8496d33b1c21f8bdc1da1e7dbf682c3d1
-SHA256 (rustc-1.51.0-src.tar.xz) = 92c68a91fca33cbafb83442cde722d010cc387dc1ee8a2680e2fb33a575821a1
-SHA256 (rust-std-1.50.0-x86_64-unknown-linux-gnu.tar.xz) = f1eb68db2b28a56ed8701edba7cf3688011d903ca12ff9d85bd21d3f8f614792
-SHA256 (rustc-1.50.0-x86_64-unknown-linux-gnu.tar.xz) = 9bebd360bcd9b5bb58f2a02930b9db4ae291adef259c96377f1f4cbd240bcf86
-SHA256 (cargo-1.50.0-x86_64-unknown-linux-gnu.tar.xz) = 3cb2c68e987e5681fca9c930973f408a71151b1b255e69669a08e54d446ee803
-SHA256 (compiler-rt-11.1.0.src.tar.xz) = def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274
+RWSE3ohX2g5d/dhLH8wjAEoM6leaUqzMYfInbjnZr876uMFm2b7C3gmpYiVSNsuP8lSugQMjHB0qlm9Uo+4ovje+tUymNGK/GAE=
+SHA256 (Pkgfile) = 2a8504ca7948ba5fa0696d91bb2042043353ad8c0a551a9ecee53d64f5d28f32
+SHA256 (.footprint) = dfcdcabb62f1272ade84727f6aff3f54324d4e176dbd0833b57373168f7b561a
+SHA256 (rustc-1.52.0-src.tar.xz) = 2393e923087f3f8f98190eb0743f1b4a8956a35274ae5d3c0fae6e43238c6af8
+SHA256 (rust-std-1.51.0-x86_64-unknown-linux-gnu.tar.xz) = 1199ba8351bb88166050c0fb15a55a23b20b6ead098d7637aaca53b91c5e68ca
+SHA256 (rustc-1.51.0-x86_64-unknown-linux-gnu.tar.xz) = feef13f6cd5072f30e2c121b7775d7ac5316998fcf03b68b2537684f3a7fe24a
+SHA256 (cargo-1.51.0-x86_64-unknown-linux-gnu.tar.xz) = 2c557e448c145ed773baae0d6533449947bb130f8f8a2a0876d08f55b74a313f
 SHA256 (libexec.patch) = 9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514
-SHA256 (rust-1.51.0-bootstrap_panic.patch) = abc04420085583d10ea1e1c766113cd10f4f35ba42c8b52ce8c234cbe01287ce
diff --git a/rust/Pkgfile b/rust/Pkgfile
index 3e0a8c509..3cab912ae 100644
--- a/rust/Pkgfile
+++ b/rust/Pkgfile
@@ -1,28 +1,25 @@
 # Description: The Rust language with Cargo included.
 # URL: https://www.rust-lang.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: llvm
+# Depends on: compiler-rt
 # Optional: sccache ccache
 
 name=rust
-version=1.51.0
-_date=2021-02-11
-_rustc=1.50.0
+version=1.52.0
+_date=2021-03-25
+_rustc=1.51.0
 _cargo=$_rustc
-_llvm=11.1.0
 release=1
 source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
 	https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-gnu.tar.xz
 	https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-gnu.tar.xz
 	https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm/compiler-rt-$_llvm.src.tar.xz
-	libexec.patch
-	rust-1.51.0-bootstrap_panic.patch)
+	libexec.patch)
 
 unpack_source() {
 	for file in ${source[@]}; do
 		case ${file##*/} in
-			rustc-${version}-src.tar.xz|compiler-rt-${_llvm}.src.tar.xz)
+			rustc-${version}-src.tar.xz)
 			echo "Unpacking $(get_filename $file)";
 			bsdtar -p -o -C ${SRC} -xf $(get_filename $file) ;;
 		*.tar.xz)
@@ -41,10 +38,6 @@ build() {
 	# Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
 	patch -p1 -i $SRC/libexec.patch
 
-	# https://github.com/rust-lang/rust/pull/81910
-	# https://github.com/rust-lang/rust/commit/31c93397bde772764cda3058e16f9cef61895090
-	patch -p1 -i $SRC/rust-1.51.0-bootstrap_panic.patch
-
 	local ERROR
 	local DATE="$(awk '/^date: / { print $2 }' src/stage0.txt)"
 	local RUSTC="$(awk '/^rustc: / { print $2 }' src/stage0.txt)"
@@ -118,8 +111,7 @@ EOF
         fi
 
 	export RUST_BACKTRACE=1
-	export RUST_COMPILER_RT_ROOT="$SRC/compiler-rt-$_llvm.src"
-	/usr/bin/python3 ./x.py build --config="${SRC}"/config.toml -j $(nproc)
+	/usr/bin/python3 ./x.py build --config="${SRC}"/config.toml -j ${JOBS-1}
 	DESTDIR=$PKG /usr/bin/python3 ./x.py --config="${SRC}"/config.toml install
 
 	[ -e '/usr/bin/zsh' ] || rm -r $PKG/usr/share/zsh
diff --git a/rust/rust-1.51.0-bootstrap_panic.patch b/rust/rust-1.51.0-bootstrap_panic.patch
deleted file mode 100644
index 529d5a1f4..000000000
--- a/rust/rust-1.51.0-bootstrap_panic.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 31c93397bde772764cda3058e16f9cef61895090 Mon Sep 17 00:00:00 2001
-From: Joshua Nelson <jyn514@gmail.com>
-Date: Mon, 8 Feb 2021 22:51:21 -0500
-Subject: [PATCH] Use format string in bootstrap panic instead of a string
- directly
-
-This fixes the following warning when compiling with nightly:
-
-```
-warning: panic message is not a string literal
-    --> src/bootstrap/builder.rs:1515:24
-     |
-1515 |                 panic!(out);
-     |                        ^^^
-     |
-     = note: `#[warn(non_fmt_panic)]` on by default
-     = note: this is no longer accepted in Rust 2021
-help: add a "{}" format string to Display the message
-     |
-1515 |                 panic!("{}", out);
-     |                        ^^^^^
-help: or use std::panic::panic_any instead
-     |
-1515 |                 std::panic::panic_any(out);
-     |                 ^^^^^^^^^^^^^^^^^^^^^^
-```
----
- src/bootstrap/builder.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index f1a160250dbe1..0f5fcb4af400d 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -1490,7 +1490,7 @@ impl<'a> Builder<'a> {
-                 for el in stack.iter().rev() {
-                     out += &format!("\t{:?}\n", el);
-                 }
--                panic!(out);
-+                panic!("{}", out);
-             }
-             if let Some(out) = self.cache.get(&step) {
-                 self.verbose(&format!("{}c {:?}", "  ".repeat(stack.len()), step));