Updated to 1.47.0

3 files changed, 42 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 935d3f96cab1..20e434ec617a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-rust
 	pkgdesc = Systems programming language focused on safety, speed and concurrency (mingw-w64)
-	pkgver = 1.46.0
+	pkgver = 1.47.0
 	pkgrel = 1
 	url = https://www.rust-lang.org
 	arch = x86_64
@@ -20,32 +20,32 @@ pkgbase = mingw-w64-rust
 	depends = libgit2
 	depends = mingw-w64-gcc>=10.1.0
 	optdepends = mingw-w64-wine: for cargo test support
-	noextract = rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz
-	noextract = rustc-1.45.2-x86_64-unknown-linux-gnu.tar.xz
-	noextract = cargo-0.46.1-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rust-std-1.46.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rustc-1.46.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = cargo-0.47.0-x86_64-unknown-linux-gnu.tar.xz
 	options = !strip
 	options = staticlibs
 	options = !buildflags
 	backup = opt/rust/cargo/config
-	source = https://static.rust-lang.org/dist/rustc-1.46.0-src.tar.xz
-	source = https://static.rust-lang.org/dist/rustc-1.46.0-src.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2020-08-03/rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2020-08-03/rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2020-08-03/rustc-1.45.2-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2020-08-03/rustc-1.45.2-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2020-08-03/cargo-0.46.1-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2020-08-03/cargo-0.46.1-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.xz
+	source = https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-08-27/rust-std-1.46.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-08-27/rust-std-1.46.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-08-27/rustc-1.46.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-08-27/rustc-1.46.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-08-27/cargo-0.47.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-08-27/cargo-0.47.0-x86_64-unknown-linux-gnu.tar.xz.asc
 	source = mingw-config.toml
 	validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE
-	sha256sums = 865dae1290a205f16ded8818c6a0254cc32862985fc250a602a70285b7d92b82
+	sha256sums = ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2
 	sha256sums = SKIP
-	sha256sums = 02309322467af8e37256ccf1f064f5233c7fca4423dffde0bd5eb32cde46942a
+	sha256sums = e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c
 	sha256sums = SKIP
-	sha256sums = 0be5c8506fd9317c7d0dc8044b5fef8501caa74f88a9a22be795d68362dc57f6
+	sha256sums = 6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12
 	sha256sums = SKIP
-	sha256sums = a27eb5d47b520ef2c554605bf789f80652af63531b4f6a1195d61b3dfd0f6e9c
+	sha256sums = 9da5c4888c6025fa174eaef330337e49666ca9562f876a34d40c03a80d432b8d
 	sha256sums = SKIP
-	sha256sums = 997cb1baafa6262b63ac0b3aa3e030c81f463823285a25079938eac6e580c096
+	sha256sums = bfe629d1832b8b7865e15526bcc9244b84e93885537cbf0a547f5f889186b932
 
 pkgname = mingw-w64-rust
 
diff --git a/PKGBUILD b/PKGBUILD
index 84d88fc71881..0196985d1a4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: userwithuid < userwithuid at gmail dot com >
 
 _pkgname=rust
-_date=2020-08-03
-_rustc=1.45.2
-_cargo=0.46.1
+_date=2020-08-27
+_rustc=1.46.0
+_cargo=0.47.0
 
 pkgname=mingw-w64-rust
 _prefix=opt/rust
-pkgver=1.46.0
+pkgver=1.47.0
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('x86_64')
@@ -39,15 +39,15 @@ source=("https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.xz"{,.asc}
 noextract=("rust-std-${_rustc}-x86_64-unknown-linux-gnu.tar.xz"
            "rustc-${_rustc}-x86_64-unknown-linux-gnu.tar.xz"
            "cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.xz")
-sha256sums=('865dae1290a205f16ded8818c6a0254cc32862985fc250a602a70285b7d92b82'
+sha256sums=('ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2'
             'SKIP'
-            '02309322467af8e37256ccf1f064f5233c7fca4423dffde0bd5eb32cde46942a'
+            'e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c'
             'SKIP'
-            '0be5c8506fd9317c7d0dc8044b5fef8501caa74f88a9a22be795d68362dc57f6'
+            '6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12'
             'SKIP'
-            'a27eb5d47b520ef2c554605bf789f80652af63531b4f6a1195d61b3dfd0f6e9c'
+            '9da5c4888c6025fa174eaef330337e49666ca9562f876a34d40c03a80d432b8d'
             'SKIP'
-            '997cb1baafa6262b63ac0b3aa3e030c81f463823285a25079938eac6e580c096')
+            'bfe629d1832b8b7865e15526bcc9244b84e93885537cbf0a547f5f889186b932')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
 
 backup=("opt/rust/cargo/config")
diff --git a/mingw-config.toml b/mingw-config.toml
index ee1485d5d20b..743cf9c4a554 100644
--- a/mingw-config.toml
+++ b/mingw-config.toml
@@ -341,8 +341,11 @@ debug-assertions-std = false
 # Debuginfo for tests run with compiletest is not controlled by this option
 # and needs to be enabled separately with `debuginfo-level-tests`.
 #
-# Defaults to 2 if debug is true
-debuginfo-level = 1
+# Note that debuginfo-level = 2 generates several gigabytes of debuginfo
+# and will slow down the linking process significantly.
+#
+# Defaults to 1 if debug is true
+debuginfo-level = 0
 
 # Debuginfo level for the compiler.
 #
@@ -352,7 +355,7 @@ debuginfo-level-rustc = 0
 # Debuginfo level for the standard library.
 #
 # Defaults to rust.debuginfo-level value
-debuginfo-level-std = 1
+debuginfo-level-std = 0
 
 # Debuginfo level for the tools.
 #
@@ -391,8 +394,7 @@ channel = "stable"
 # desired in distributions, for example.
 rpath = true
 
-# Emits extraneous output from tests to ensure that failures of the test
-# harness are debuggable just from logfiles.
+# Emits extra output from tests so test failures are debuggable just from logfiles.
 verbose-tests = false
 
 # Flag indicating whether tests are compiled with optimizations (the -O flag).
@@ -431,7 +433,7 @@ lld = true
 #
 # LLD will not be used if we're cross linking or running tests.
 #
-# Explicitly setting the linker for a target will override this option.
+# Explicitly setting the linker for a target will override this option when targeting MSVC.
 use-lld = false
 
 # Indicates whether some LLVM tools, like llvm-objdump, will be made available in the
@@ -454,8 +456,7 @@ verify-llvm-ir = false
 # instead of LLVM's default of 100.
 #thin-lto-import-instr-limit = 100
 
-# Map all debuginfo paths for libstd and crates to `/rust/$sha/$crate/...`,
-# generally only set for releases
+# Map debuginfo paths to `/rust/$sha/...`, generally only set for releases
 remap-debuginfo = false
 
 # Link the compiler against `jemalloc`, where on Linux and OSX it should
@@ -474,6 +475,10 @@ llvm-libunwind = false
 # This only applies from stage 1 onwards, and only for Windows targets.
 control-flow-guard = false
 
+# Enable symbol-mangling-version v0. This can be helpful when profiling rustc,
+# as generics will be preserved in symbols (rather than erased into opaque T).
+new-symbol-mangling = false
+
 # =============================================================================
 # Options for specific targets
 #
@@ -502,7 +507,7 @@ ranlib = "ranlib"
 # Linker to be used to link Rust code. Note that the
 # default value is platform specific, and if not specified it may also depend on
 # what platform is crossing to what platform.
-# Setting this will override the `use-lld` option for Rust code.
+# Setting this will override the `use-lld` option for Rust code when targeting MSVC.
 linker = "cc"
 
 # Path to the `llvm-config` binary of the installation of a custom LLVM to link
@@ -563,7 +568,7 @@ ranlib = "i686-w64-mingw32-ranlib"
 # Linker to be used to link Rust code. Note that the
 # default value is platform specific, and if not specified it may also depend on
 # what platform is crossing to what platform.
-# Setting this will override the `use-lld` option for Rust code.
+# Setting this will override the `use-lld` option for Rust code when targeting MSVC.
 linker = "i686-w64-mingw32-cc"
 
 # Path to the `llvm-config` binary of the installation of a custom LLVM to link
@@ -624,7 +629,7 @@ ranlib = "x86_64-w64-mingw32-ranlib"
 # Linker to be used to link Rust code. Note that the
 # default value is platform specific, and if not specified it may also depend on
 # what platform is crossing to what platform.
-# Setting this will override the `use-lld` option for Rust code.
+# Setting this will override the `use-lld` option for Rust code when targeting MSVC.
 linker = "x86_64-w64-mingw32-cc"
 
 # Path to the `llvm-config` binary of the installation of a custom LLVM to link