updated to 1.62.0

3 files changed, 45 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba40f7a83995..f824e39dd1c2 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.61.0
+	pkgver = 1.62.0
 	pkgrel = 1
 	url = https://www.rust-lang.org
 	arch = x86_64
@@ -20,31 +20,31 @@ 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.60.0-x86_64-unknown-linux-gnu.tar.xz
-	noextract = rustc-1.60.0-x86_64-unknown-linux-gnu.tar.xz
-	noextract = cargo-1.60.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rustc-1.61.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = cargo-1.61.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.61.0-src.tar.xz
-	source = https://static.rust-lang.org/dist/rustc-1.61.0-src.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2022-04-07/rust-std-1.60.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2022-04-07/rust-std-1.60.0-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2022-04-07/rustc-1.60.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2022-04-07/rustc-1.60.0-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2022-04-07/cargo-1.60.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2022-04-07/cargo-1.60.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/rustc-1.62.0-src.tar.xz
+	source = https://static.rust-lang.org/dist/rustc-1.62.0-src.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2022-05-19/rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2022-05-19/rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2022-05-19/rustc-1.61.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2022-05-19/rustc-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2022-05-19/cargo-1.61.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2022-05-19/cargo-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc
 	source = mingw-config.toml
 	validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE
-	sha256sums = a63305a3ad734f170746b337a5e3d07ccaa7aa8f253dc52336b44c0a3b549d7b
+	sha256sums = 6c00ef115c894c2645e60b5049a4f5dacf1dc0c993f3074f7ae4fdf4c755dd5e
 	sha256sums = SKIP
-	sha256sums = 6fb8ee3650beb10836ae48a9aaa535473e64eaca20695b88113267aea3c7557f
+	sha256sums = 270b07aa5f2de52255a117e1e587138d77375ce0d09a1d7fead085f29b3977e9
 	sha256sums = SKIP
-	sha256sums = fc0b41c15e348ad0eeb7a6c015a922a2ac95e9577e531635558b26d99399f315
+	sha256sums = 21c4613f389ed130fbaaf88f1e984319f72b5fc10734569a5ba19e22ebb03abd
 	sha256sums = SKIP
-	sha256sums = 48edb2eb51d7c56ef9a3130f0b331e83f139559161f6f93b9588d28cf72610f3
+	sha256sums = 9461727d754f865ef2a87479d40bbe4c5176f80963b7c50b7797bc8940d7a0a0
 	sha256sums = SKIP
-	sha256sums = 36bd9ae0b65dcc8e61fc8e7dea335653ba981ac086a76bd6f158e7634c04e577
+	sha256sums = c1141f88430b5ccbe037cd5e0d075ab571958f8a5d862f8ad7f7994064eec737
 
 pkgname = mingw-w64-rust
diff --git a/PKGBUILD b/PKGBUILD
index b11b0f45ef26..2946c8f595b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
 # Contributor: userwithuid < userwithuid at gmail dot com >
 
 _pkgname=rust
-_date=2022-04-07
-_rustc=1.60.0
+_date=2022-05-19
+_rustc=1.61.0
 
 pkgname=mingw-w64-rust
 _prefix=opt/rust
-pkgver=1.61.0
+pkgver=1.62.0
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('x86_64')
@@ -38,15 +38,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-${_rustc}-x86_64-unknown-linux-gnu.tar.xz")
-sha256sums=('a63305a3ad734f170746b337a5e3d07ccaa7aa8f253dc52336b44c0a3b549d7b'
+sha256sums=('6c00ef115c894c2645e60b5049a4f5dacf1dc0c993f3074f7ae4fdf4c755dd5e'
             'SKIP'
-            '6fb8ee3650beb10836ae48a9aaa535473e64eaca20695b88113267aea3c7557f'
+            '270b07aa5f2de52255a117e1e587138d77375ce0d09a1d7fead085f29b3977e9'
             'SKIP'
-            'fc0b41c15e348ad0eeb7a6c015a922a2ac95e9577e531635558b26d99399f315'
+            '21c4613f389ed130fbaaf88f1e984319f72b5fc10734569a5ba19e22ebb03abd'
             'SKIP'
-            '48edb2eb51d7c56ef9a3130f0b331e83f139559161f6f93b9588d28cf72610f3'
+            '9461727d754f865ef2a87479d40bbe4c5176f80963b7c50b7797bc8940d7a0a0'
             'SKIP'
-            '36bd9ae0b65dcc8e61fc8e7dea335653ba981ac086a76bd6f158e7634c04e577')
+            'c1141f88430b5ccbe037cd5e0d075ab571958f8a5d862f8ad7f7994064eec737')
 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 bc424b9d0cd0..cafa929d7b01 100644
--- a/mingw-config.toml
+++ b/mingw-config.toml
@@ -473,13 +473,23 @@ debuginfo-level-tools = 0
 # FIXME(#61117): Some tests fail when this option is enabled.
 debuginfo-level-tests = 0
 
-# Whether to run `dsymutil` on Apple platforms to gather debug info into .dSYM
-# bundles. `dsymutil` adds time to builds for no clear benefit, and also makes
-# it more difficult for debuggers to find debug info. The compiler currently
-# defaults to running `dsymutil` to preserve its historical default, but when
-# compiling the compiler itself, we skip it by default since we know it's safe
-# to do so in that case.
-#run-dsymutil = false
+# Should rustc be build with split debuginfo? Default is platform dependent.
+# Valid values are the same as those accepted by `-C split-debuginfo`
+# (`off`/`unpacked`/`packed`).
+#
+# On Linux, split debuginfo is disabled by default.
+#
+# On Apple platforms, unpacked split debuginfo is used by default. Unpacked
+# debuginfo does not run `dsymutil`, which packages debuginfo from disparate
+# object files into a single `.dSYM` file. `dsymutil` adds time to builds for
+# no clear benefit, and also makes it more difficult for debuggers to find
+# debug info. The compiler currently defaults to running `dsymutil` to preserve
+# its historical default, but when compiling the compiler itself, we skip it by
+# default since we know it's safe to do so in that case.
+#
+# On Windows platforms, packed debuginfo is the only supported option,
+# producing a `.pdb` file.
+#split-debuginfo = if linux { off } else if windows { packed } else if apple { unpacked }
 
 # Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
 backtrace = true
@@ -676,7 +686,7 @@ linker = "cc"
 #sanitizers = build.sanitizers (bool)
 
 # Build the profiler runtime for this target(required when compiling with options that depend
-# on this runtime, such as `-C profile-generate` or `-Z instrument-coverage`).
+# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
 # This option will override the same option under [build] section.
 #profiler = build.profiler (bool)
 
@@ -751,7 +761,7 @@ linker = "i686-w64-mingw32-cc"
 #sanitizers = build.sanitizers (bool)
 
 # Build the profiler runtime for this target(required when compiling with options that depend
-# on this runtime, such as `-C profile-generate` or `-Z instrument-coverage`).
+# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
 # This option will override the same option under [build] section.
 #profiler = build.profiler (bool)
 
@@ -826,7 +836,7 @@ linker = "x86_64-w64-mingw32-cc"
 #sanitizers = build.sanitizers (bool)
 
 # Build the profiler runtime for this target(required when compiling with options that depend
-# on this runtime, such as `-C profile-generate` or `-Z instrument-coverage`).
+# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
 # This option will override the same option under [build] section.
 #profiler = build.profiler (bool)