Updated to 1.48.0

3 files changed, 94 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20e434ec617a..f7c37abbf2db 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.47.0
+	pkgver = 1.48.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.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
+	noextract = rust-std-1.47.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rustc-1.47.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = cargo-0.48.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.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 = https://static.rust-lang.org/dist/rustc-1.48.0-src.tar.xz
+	source = https://static.rust-lang.org/dist/rustc-1.48.0-src.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-10-08/rust-std-1.47.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-10-08/rust-std-1.47.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-10-08/rustc-1.47.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-10-08/rustc-1.47.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-x86_64-unknown-linux-gnu.tar.xz.asc
 	source = mingw-config.toml
 	validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE
-	sha256sums = ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2
+	sha256sums = ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908
 	sha256sums = SKIP
-	sha256sums = e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c
+	sha256sums = a469db59f7df3a5e4003421d853b274e828b537d2d56fd5ce6bba8ba73266f02
 	sha256sums = SKIP
-	sha256sums = 6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12
+	sha256sums = 6effe67c3461335eabba2334f4747260bd479c938e635899a60ed094beec7481
 	sha256sums = SKIP
-	sha256sums = 9da5c4888c6025fa174eaef330337e49666ca9562f876a34d40c03a80d432b8d
+	sha256sums = 6958f9797b7acacb708423c61f5e8b23c63d9e96fdc7c07fdb0a3feafeaf27e9
 	sha256sums = SKIP
-	sha256sums = bfe629d1832b8b7865e15526bcc9244b84e93885537cbf0a547f5f889186b932
+	sha256sums = 4d59d264afca077ff6a77564ad9027ada0f48975f8801d1024749f47b5efb906
 
 pkgname = mingw-w64-rust
 
diff --git a/PKGBUILD b/PKGBUILD
index 0196985d1a4a..11603ad45eeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: userwithuid < userwithuid at gmail dot com >
 
 _pkgname=rust
-_date=2020-08-27
-_rustc=1.46.0
-_cargo=0.47.0
+_date=2020-10-08
+_rustc=1.47.0
+_cargo=0.48.0
 
 pkgname=mingw-w64-rust
 _prefix=opt/rust
-pkgver=1.47.0
+pkgver=1.48.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=('ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2'
+sha256sums=('ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908'
             'SKIP'
-            'e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c'
+            'a469db59f7df3a5e4003421d853b274e828b537d2d56fd5ce6bba8ba73266f02'
             'SKIP'
-            '6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12'
+            '6effe67c3461335eabba2334f4747260bd479c938e635899a60ed094beec7481'
             'SKIP'
-            '9da5c4888c6025fa174eaef330337e49666ca9562f876a34d40c03a80d432b8d'
+            '6958f9797b7acacb708423c61f5e8b23c63d9e96fdc7c07fdb0a3feafeaf27e9'
             'SKIP'
-            'bfe629d1832b8b7865e15526bcc9244b84e93885537cbf0a547f5f889186b932')
+            '4d59d264afca077ff6a77564ad9027ada0f48975f8801d1024749f47b5efb906')
 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 743cf9c4a554..523341776a96 100644
--- a/mingw-config.toml
+++ b/mingw-config.toml
@@ -9,11 +9,42 @@
 # a custom configuration file can also be specified with `--config` to the build
 # system.
 
+# Keeps track of the last version of `x.py` used.
+# If it does not match the version that is currently running,
+# `x.py` will prompt you to update it and read the changelog.
+# See `src/bootstrap/CHANGELOG.md` for more information.
+changelog-seen = 1
+
+# =============================================================================
+# Global Settings
+# =============================================================================
+
+# Use different pre-set defaults than the global defaults.
+#
+# See `src/bootstrap/defaults` for more information.
+# Note that this has no default value (x.py uses the defaults in `config.toml.example`).
+#profile = <none>
+
 # =============================================================================
 # Tweaking how LLVM is compiled
 # =============================================================================
 [llvm]
 
+# Whether to use Rust CI built LLVM instead of locally building it.
+#
+# Unless you're developing for a target where Rust CI doesn't build a compiler
+# toolchain or changing LLVM locally, you probably want to set this to true.
+#
+# It's currently false by default due to being newly added; please file bugs if
+# enabling this did not work for you on x86_64-unknown-linux-gnu.
+# Other target triples are currently not supported; see #77084.
+#
+# We also currently only support this when building LLVM for the build triple.
+#
+# Note that many of the LLVM options are not currently supported for
+# downloading. Currently only the "assertions" option can be toggled.
+download-ci-llvm = false
+
 # Indicates whether LLVM rebuild should be skipped when running bootstrap. If
 # this is `false` then the compiler's LLVM will be rebuilt whenever the built
 # version doesn't have the correct hash. If it is `true` then LLVM will never
@@ -45,13 +76,11 @@ ccache = false
 # this flag will indicate that this version check should not be done.
 #version-check = true
 
-# Link libstdc++ statically into the librustc_llvm instead of relying on a
+# Link libstdc++ statically into the rustc_llvm instead of relying on a
 # dynamic version to be available.
 static-libstdcpp = true
 
-# Tell the LLVM build system to use Ninja instead of the platform default for
-# the generated build system. This can sometimes be faster than make, for
-# example.
+# Whether to use Ninja to build LLVM. This runs much faster than make.
 ninja = true
 
 # LLVM targets to build support for.
@@ -113,6 +142,23 @@ allow-old-toolchain = false
 # General build configuration options
 # =============================================================================
 [build]
+# The default stage to use for the `doc` subcommand
+doc-stage = 0
+
+# The default stage to use for the `build` subcommand
+build-stage = 2
+
+# The default stage to use for the `test` subcommand
+test-stage = 1
+
+# The default stage to use for the `dist` subcommand
+dist-stage = 2
+
+# The default stage to use for the `install` subcommand
+install-stage = 2
+
+# The default stage to use for the `bench` subcommand
+bench-stage = 2
 
 # Build triple for the original snapshot compiler. This must be a compiler that
 # nightlies are already produced for. The current platform must be able to run
@@ -122,19 +168,18 @@ allow-old-toolchain = false
 # Defaults to host platform
 build = "x86_64-unknown-linux-gnu"
 
-# In addition to the build triple, other triples to produce full compiler
-# toolchains for. Each of these triples will be bootstrapped from the build
-# triple and then will continue to bootstrap themselves. This platform must
-# currently be able to run all of the triples provided here.
+# Which triples to produce a compiler toolchain for. Each of these triples will
+# be bootstrapped from the build triple themselves.
 #
 # Defaults to just the build triple
 host = ["x86_64-unknown-linux-gnu"]
 
-# In addition to all host triples, other triples to produce the standard library
-# for. Each host triple will be used to produce a copy of the standard library
-# for each target triple.
+# Which triples to build libraries (core/alloc/std/test/proc_macro) for. Each of
+# these triples will be bootstrapped from the build triple themselves.
 #
-# Defaults to just the build triple
+# Defaults to `host`. If you set this explicitly, you likely want to add all
+# host triples to this list as well in order for those host toolchains to be
+# able to compile programs for their native target.
 target = ["x86_64-unknown-linux-gnu", "i686-pc-windows-gnu", "x86_64-pc-windows-gnu"]
 
 # Use this directory to store build artifacts.
@@ -311,6 +356,8 @@ debug = false
 # Number of codegen units to use for each compiler invocation. A value of 0
 # means "the number of cores on this machine", and 1+ is passed through to the
 # compiler.
+#
+# Uses the rustc defaults: https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units
 codegen-units = 0
 
 # Sets the number of codegen units to build the standard library with,
@@ -331,6 +378,12 @@ debug-assertions = false
 # Defaults to rust.debug-assertions value
 debug-assertions-std = false
 
+# Whether or not to leave debug! and trace! calls in the rust binary.
+# Overrides the `debug-assertions` option, if defined.
+#
+# Defaults to rust.debug-assertions value
+debug-logging = false
+
 # Debuginfo level for most of Rust code, corresponds to the `-C debuginfo=N` option of `rustc`.
 # `0` - no debug info
 # `1` - line tables only - sufficient to generate backtraces that include line
@@ -373,6 +426,7 @@ backtrace = true
 incremental = false
 
 # Build a multi-threaded rustc
+# FIXME(#75760): Some UI tests fail when this option is enabled.
 parallel-compiler = false
 
 # The default linker that will be hard-coded into the generated compiler for
@@ -394,7 +448,7 @@ channel = "stable"
 # desired in distributions, for example.
 rpath = true
 
-# Emits extra output from tests so test failures are debuggable just from logfiles.
+# Prints each test name as it is executed, to help debug issues in the test harness itself.
 verbose-tests = false
 
 # Flag indicating whether tests are compiled with optimizations (the -O flag).
@@ -431,7 +485,7 @@ lld = true
 # supported platforms. The LLD from the bootstrap distribution will be used
 # and not the LLD compiled during the bootstrap.
 #
-# LLD will not be used if we're cross linking or running tests.
+# LLD will not be used if we're cross linking.
 #
 # Explicitly setting the linker for a target will override this option when targeting MSVC.
 use-lld = false