rust: 1.45.2 -> 1.46.0

3 files changed, 57 insertions, 51 deletions

diff --git a/rust/.footprint b/rust/.footprint
index 0dfcaf070..f2665d38f 100644
--- a/rust/.footprint
+++ b/rust/.footprint
@@ -16,17 +16,21 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 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/debugger_pretty_printers_common.py
 -rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
--rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_rust_pretty_printing.py
--rw-r--r--	root/root	usr/lib/rustlib/etc/lldb_rust_formatters.py
+-rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_lookup.py
+-rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_providers.py
+-rw-r--r--	root/root	usr/lib/rustlib/etc/lldb_lookup.py
+-rw-r--r--	root/root	usr/lib/rustlib/etc/lldb_providers.py
+-rw-r--r--	root/root	usr/lib/rustlib/etc/rust_types.py
 -rw-r--r--	root/root	usr/lib/rustlib/install.log
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-cargo
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-clippy-preview
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-miri-preview
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rls-preview
+-rw-r--r--	root/root	usr/lib/rustlib/manifest-rust-analysis-i686-unknown-linux-gnu
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rust-src
+-rw-r--r--	root/root	usr/lib/rustlib/manifest-rust-std-i686-unknown-linux-gnu
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rust-std-x86_64-unknown-linux-gnu
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rustfmt-preview
 drwxr-xr-x	root/root	usr/lib/rustlib/src/
@@ -128,6 +132,8 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/libcore/array/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/any.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/ascii.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/ascii/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/ascii/is_ascii.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/char/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/char/methods.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/benches/char/mod.rs
@@ -176,6 +182,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/libcore/future/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/future/into_future.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/future/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/future/pending.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/future/poll_fn.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/future/ready.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/libcore/hash/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/libcore/hash/mod.rs
diff --git a/rust/.signature b/rust/.signature
index c0d7aba47..2b99c1c5b 100644
--- a/rust/.signature
+++ b/rust/.signature
@@ -1,8 +1,9 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ckNDjqRtClJxCUSY9uYuB5eOLfDKcUOhMtpThX/ekMiU1Z9ncNTQpCC7NWDYUJpP9+DQTNUrT+0rK8yf24RCQ4=
-SHA256 (Pkgfile) = 7bd4875f6b72a28c3af9ea21aab2a3597bb7ff624c9214863acb6b4d66d3ad33
-SHA256 (.footprint) = d187e1b0843afe32e784e29d5d3b4844b60f78e5e332325ecdde495daa2bdcdb
-SHA256 (rustc-1.45.2-src.tar.xz) = f8412adac2f5d974b2f06c5bd4be7361084d18a678d098bf05de5ccfa57b74a9
-SHA256 (rust-std-1.44.0-x86_64-unknown-linux-gnu.tar.xz) = 122b2a909fc185c6ae5a0110af6f60699f4332b4fb3c43698b14a873fbe65b6e
-SHA256 (rustc-1.44.0-x86_64-unknown-linux-gnu.tar.xz) = fe1d8d81950eea1f67219abc49bc1ae88b2b27fd02d1bffa38b43bc5bff05124
-SHA256 (cargo-0.45.0-x86_64-unknown-linux-gnu.tar.xz) = 4ee5811bfb5fd0eb26fcf7f9b57f4e8fced458219ba52bff6d2474321ff39c18
+RWSE3ohX2g5d/fMxsn4MpWUj2oZdvFdemLr2Fm7IVIQtf598nD9nekyOtmoLWJ3d0spHm6qANghrCb+UcwiDDanhyuSZqnIlcwM=
+SHA256 (Pkgfile) = 339989a8e05bc3d2cdfde7554b04c122a91f6702199b82f38d02ab1462983a8a
+SHA256 (.footprint) = f97f7e5cb932d4eb6d4ab793cdbaf15823ac94960a53139792e3e62d0ab8bb2d
+SHA256 (rustc-1.46.0-src.tar.xz) = 865dae1290a205f16ded8818c6a0254cc32862985fc250a602a70285b7d92b82
+SHA256 (rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz) = 02309322467af8e37256ccf1f064f5233c7fca4423dffde0bd5eb32cde46942a
+SHA256 (rustc-1.45.2-x86_64-unknown-linux-gnu.tar.xz) = 0be5c8506fd9317c7d0dc8044b5fef8501caa74f88a9a22be795d68362dc57f6
+SHA256 (cargo-0.46.1-x86_64-unknown-linux-gnu.tar.xz) = a27eb5d47b520ef2c554605bf789f80652af63531b4f6a1195d61b3dfd0f6e9c
+SHA256 (compiler-rt-10.0.1.src.tar.xz) = d90dc8e121ca0271f0fd3d639d135bfaa4b6ed41e67bd6eb77808f72629658fa
diff --git a/rust/Pkgfile b/rust/Pkgfile
index ba639c507..b38d136ae 100644
--- a/rust/Pkgfile
+++ b/rust/Pkgfile
@@ -2,36 +2,35 @@
 # URL: https://www.rust-lang.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: llvm
-# Optional: sccache llvm-32
+# Optional: sccache
 
 name=rust
-version=1.45.2
-##cat src/stage0.txt
-_date=2020-06-04
-_rustc=1.44.0
-_cargo=0.45.0
-##
-
+version=1.46.0
+_date=2020-08-03
+_rustc=1.45.2
+_cargo=0.46.1
+_llvm=10.0.1
 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
 )
 
 unpack_source() {
 	for file in ${source[@]}; do
 		case ${file##*/} in
-			rustc-${version}-src.tar.xz)
+			rustc-${version}-src.tar.xz|compiler-rt-${_llvm}.src.tar.xz)
 			echo "Unpacking $(get_filename $file)";
-			bsdtar -p -o -C $SRC -xf $(get_filename $file) ;;
+			bsdtar -p -o -C ${SRC} -xf $(get_filename $file) ;;
 		*.tar.xz)
 			echo "Copying $(get_filename $file)";
-			mkdir -p $SRC/${name}c-$version-src/build/cache/$_date || true
-			cp $(get_filename $file) $SRC/${name}c-$version-src/build/cache/$_date ;;
+			mkdir -p ${SRC}/${name}c-$version-src/build/cache/${_date} || true
+			cp $(get_filename $file) ${SRC}/${name}c-$version-src/build/cache/${_date} ;;
 		*)
-			cp $(get_filename $file) $SRC ;;
+			cp $(get_filename $file) ${SRC} ;;
 		esac
 	done
 }
@@ -58,13 +57,9 @@ build() {
 	[ $ERROR ] && exit 1
 	unset DATE RUSTC CARGO ERROR
 
-	prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
-
 cat <<- EOF > $SRC/config.toml
 	[llvm]
 	ninja = true
-	targets = "X86"
-	experimental-targets = ""
 	link-shared = true
 
 	[install]
@@ -73,36 +68,36 @@ cat <<- EOF > $SRC/config.toml
 	[rust]
 	channel = "stable"
 	rpath = false
-	codegen-tests = false
-	backtrace-on-ice = true
+	codegen-units-std = 1
+	debuginfo-level-std = 2
 
 	[build]
+	target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
+	tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"]
 	docs = false
 	extended = true
-	python = "python3"
+	sanitizers = false
+	profiler = true
+	vendor = true
+	python = "/usr/bin/python3"
+	@CARGO@
+	@RUST@
+
+	[target.x86_64-unknown-linux-gnu]
+	llvm-config = "/usr/bin/llvm-config"
 EOF
-	# part of [build] options
+
 	if [ -e '/usr/bin/rustc' ]; then
 		if [ -z "$(/usr/bin/ldd /usr/bin/rustc | egrep '.*libLLVM.*.so => not found')" ]; then
-cat <<- EOF >> $SRC/config.toml
-	cargo = "/usr/bin/cargo"
-	rustc = "/usr/bin/rustc"
-EOF
+			sed	-e 's|@CARGO@|cargo = "/usr/bin/cargo"|' \
+				-e 's|@RUST@|rustc = "/usr/bin/rustc"|' \
+				-i $SRC/config.toml
 		else
+			sed -e 's|@CARGO@||' -e 's|@RUST@||' -i $SRC/config.toml
 			printf "\e[031mllvm broken symlink detected, not using system rust to bootstrap\033[0m\n"
 		fi
-	fi
-
-cat <<- EOF >> $SRC/config.toml
-	[target.x86_64-unknown-linux-gnu]
-	llvm-config = "/usr/bin/llvm-config"
-EOF
-
-	if [ -e '/usr/bin/llvm-config-32' ]; then
-cat <<- EOF >> $SRC/config.toml
-	[target.i686-unknown-linux-gnu]
-	llvm-config = "/usr/bin/llvm-config-32"
-EOF
+	else
+		sed -e 's|@CARGO@||' -e 's|@RUST@||' -i $SRC/config.toml
 	fi
 
 	cat $SRC/config.toml
@@ -110,12 +105,15 @@ EOF
 	mkdir "$PKGMK_SOURCE_DIR/rust" || true
 	export CARGO_HOME="$PKGMK_SOURCE_DIR/rust"
 
-	export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi"
-	/usr/bin/python3 ./x.py build --config="${SRC}"/config.toml --exclude src/tools/miri -j ${JOBS-1}
+        if [ -e '/usr/bin/sccache' ]; then
+                export RUSTC_WRAPPER='/usr/bin/sccache'
+                export SCCACHE_IDLE_TIMEOUT='1500'
+        fi
 
-	export LIBSSH2_SYS_USE_PKG_CONFIG=1
+	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)
 	DESTDIR=$PKG /usr/bin/python3 ./x.py --config="${SRC}"/config.toml install
-	unset LIBSSH2_SYS_USE_PKG_CONFIG
 
 	[ -e '/usr/bin/zsh' ] || rm -r $PKG/usr/share/zsh