Updated to 1.42.0

3 files changed, 50 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84e77e79987d..cf779c805d1f 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.41.1
+	pkgver = 1.42.0
 	pkgrel = 1
 	url = https://www.rust-lang.org
 	arch = x86_64
@@ -12,7 +12,6 @@ pkgbase = mingw-w64-rust
 	makedepends = libffi
 	makedepends = perl
 	makedepends = python
-	makedepends = python2
 	makedepends = nodejs
 	makedepends = procps-ng
 	makedepends = cmake
@@ -21,32 +20,32 @@ pkgbase = mingw-w64-rust
 	depends = libgit2
 	depends = mingw-w64-gcc
 	optdepends = mingw-w64-wine: for cargo test support
-	noextract = rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz
-	noextract = rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz
-	noextract = cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rust-std-1.41.1-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rustc-1.41.1-x86_64-unknown-linux-gnu.tar.xz
+	noextract = cargo-0.42.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.41.1-src.tar.xz
-	source = https://static.rust-lang.org/dist/rustc-1.41.1-src.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.xz
+	source = https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-gnu.tar.xz.asc
 	source = mingw-config.toml
 	validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE
-	sha256sums = ebac9861b43c7207af36e24402dfdc5463a4df4bdb015ccb2b165251c0fdcf7c
+	sha256sums = aa5b4c0f2bac33cc26a11523fce9b0f120d2eff510ed148ae7c586501481ed04
 	sha256sums = SKIP
-	sha256sums = 5a0b14a51f51b0194f70a2023749d9cb49c3b2e11f0d4c8232960b91fad336ac
+	sha256sums = 8e0d2ccfaaeec2e2007b3a605e2bf1dac2e2c82a8d4168bf4e81c9dd5374214e
 	sha256sums = SKIP
-	sha256sums = b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111
+	sha256sums = cf5051c312ae70b00dedf269ea71499c392087428677f961c3b4ac9da64a92b9
 	sha256sums = SKIP
-	sha256sums = 9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c
+	sha256sums = 390156ca95741ea62e18952e2a703437ab4ad400064a22a23a2bffe9a337e8a8
 	sha256sums = SKIP
-	sha256sums = af317e038e19b8648f762dfefd78cee944e407665aeeb1a982873f574496688a
+	sha256sums = 7a8f602a8a179046656ae1327e089b35f1b3ac1c92ae16ca728fcb916dcfe829
 
 pkgname = mingw-w64-rust
 
diff --git a/PKGBUILD b/PKGBUILD
index 991038a9dde7..d352e93ef7bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: userwithuid < userwithuid at gmail dot com >
 
 _pkgname=rust
-_date=2019-12-19
-_rustc=1.40.0
-_cargo=0.41.0
+_date=2020-02-27
+_rustc=1.41.1
+_cargo=0.42.0
 
 pkgname=mingw-w64-rust
 _prefix=opt/rust
-pkgver=1.41.1
+pkgver=1.42.0
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('x86_64')
@@ -27,7 +27,6 @@ makedepends=('gdb'
              'libffi'
              'perl'
              'python'
-             'python2'
              'nodejs'
              'procps-ng'
              'cmake')
@@ -40,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=('ebac9861b43c7207af36e24402dfdc5463a4df4bdb015ccb2b165251c0fdcf7c'
+sha256sums=('aa5b4c0f2bac33cc26a11523fce9b0f120d2eff510ed148ae7c586501481ed04'
             'SKIP'
-            '5a0b14a51f51b0194f70a2023749d9cb49c3b2e11f0d4c8232960b91fad336ac'
+            '8e0d2ccfaaeec2e2007b3a605e2bf1dac2e2c82a8d4168bf4e81c9dd5374214e'
             'SKIP'
-            'b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111'
+            'cf5051c312ae70b00dedf269ea71499c392087428677f961c3b4ac9da64a92b9'
             'SKIP'
-            '9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c'
+            '390156ca95741ea62e18952e2a703437ab4ad400064a22a23a2bffe9a337e8a8'
             'SKIP'
-            'af317e038e19b8648f762dfefd78cee944e407665aeeb1a982873f574496688a')
+            '7a8f602a8a179046656ae1327e089b35f1b3ac1c92ae16ca728fcb916dcfe829')
 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 70357a0f0059..f43dc1a5193e 100644
--- a/mingw-config.toml
+++ b/mingw-config.toml
@@ -14,6 +14,12 @@
 # =============================================================================
 [llvm]
 
+# 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
+# be rebuilt. The default value is `false`.
+skip-rebuild = false
+
 # Indicates whether the LLVM build is a Release or Debug build
 optimize = true
 
@@ -132,6 +138,10 @@ target = ["x86_64-unknown-linux-gnu", "i686-pc-windows-gnu", "x86_64-pc-windows-
 # specified, use this rustc binary instead as the stage0 snapshot compiler.
 #rustc = "/path/to/bin/rustc"
 
+# Instead of download the src/stage0.txt version of rustfmt specified,
+# use this rustfmt binary instead as the stage0 snapshot rustfmt.
+#rustfmt = "/path/to/bin/rustfmt"
+
 # Flag to specify whether any documentation is built. If false, rustdoc and
 # friends will still be compiled but they will not be used to generate any
 # documentation.
@@ -171,21 +181,23 @@ locked-deps = false
 # Indicate whether the vendored sources are used for Rust dependencies or not
 vendor = true
 
-# Typically the build system will build the rust compiler twice. The second
+# Typically the build system will build the Rust compiler twice. The second
 # compiler, however, will simply use its own libraries to link against. If you
 # would rather to perform a full bootstrap, compiling the compiler three times,
 # then you can set this option to true. You shouldn't ever need to set this
 # option to true.
 full-bootstrap = false
 
-# Enable a build of the extended rust tool set which is not only the compiler
+# Enable a build of the extended Rust tool set which is not only the compiler
 # but also tools such as Cargo. This will also produce "combined installers"
 # which are used to install Rust and Cargo together. This is disabled by
-# default.
+# default. The `tools` option (immediately below) specifies which tools should
+# be built if `extended = true`.
 extended = true
 
-# Installs chosen set of extended tools if enabled. By default builds all.
-# If chosen tool failed to build the installation fails.
+# Installs chosen set of extended tools if `extended = true`. By default builds all.
+# If chosen tool failed to build the installation fails. If `extended = false`, this
+# option is ignored.
 tools = ["cargo"]
 
 # Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
@@ -400,6 +412,13 @@ backtrace-on-ice = false
 # Whether to verify generated LLVM IR
 verify-llvm-ir = false
 
+# Compile the compiler with a non-default ThinLTO import limit. This import
+# limit controls the maximum size of functions imported by ThinLTO. Decreasing
+# will make code compile faster at the expense of lower runtime performance.
+# If `incremental` is set to true above, the import limit will default to 10
+# 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
 remap-debuginfo = false