extra/rust to 1.40.0-1

extra/rust/0001-WIP-minimize-the-rust-std-component.patch

@@ -1,62 +0,0 @@
-From 14948e9d7bdb5cc7e975c1f3435692eeb748f07b Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 27 Sep 2019 12:33:08 -0700
-Subject: [PATCH] [WIP] minimize the rust-std component
-
----
- src/bootstrap/dist.rs | 33 +++++++++------------------------
- 1 file changed, 9 insertions(+), 24 deletions(-)
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index d9dff77a30e..bd96a6371fc 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -675,36 +675,21 @@ impl Step for Std {
-             return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
-         }
- 
--        // We want to package up as many target libraries as possible
--        // for the `rust-std` package, so if this is a host target we
--        // depend on librustc and otherwise we just depend on libtest.
--        if builder.hosts.iter().any(|t| t == target) {
--            builder.ensure(compile::Rustc { compiler, target });
--        } else {
--            builder.ensure(compile::Std { compiler, target });
--        }
-+        builder.ensure(compile::Std { compiler, target });
- 
-         let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
-         let _ = fs::remove_dir_all(&image);
- 
--        let dst = image.join("lib/rustlib").join(target);
-+        let dst = image.join("lib/rustlib").join(target).join("lib");
-         t!(fs::create_dir_all(&dst));
--        let mut src = builder.sysroot_libdir(compiler, target).to_path_buf();
--        src.pop(); // Remove the trailing /lib folder from the sysroot_libdir
--        builder.cp_filtered(&src, &dst, &|path| {
--            if let Some(name) = path.file_name().and_then(|s| s.to_str()) {
--                if name == builder.config.rust_codegen_backends_dir.as_str() {
--                    return false
--                }
--                if name == "bin" {
--                    return false
--                }
--                if name.contains("LLVM") {
--                    return false
--                }
-+
-+        let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
-+        let stamp = dbg!(compile::libstd_stamp(builder, compiler_to_use, target));
-+        for (path, host) in builder.read_stamp_file(&stamp) {
-+            if !host {
-+                builder.copy(&path, &dst.join(path.file_name().unwrap()));
-             }
--            true
--        });
-+        }
- 
-         let mut cmd = rust_installer(builder);
-         cmd.arg("generate")
--- 
-2.24.0
-

extra/rust/PKGBUILD

@@ -15,7 +15,7 @@ highmem=1
 
 pkgname=('rust' 'rust-docs')
 epoch=1
-pkgver=1.39.0
+pkgver=1.40.0
 pkgrel=1
 
 _llvm_ver=9.0.0
@@ -31,14 +31,12 @@ checkdepends=('procps-ng' 'gdb')
 options=('!emptydirs')
 
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        "http://releases.llvm.org/$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
-        0001-WIP-minimize-the-rust-std-component.patch)
+        "http://releases.llvm.org/$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
 
-sha256sums=('b4a1f6b6a93931f270691aba4fc85eee032fecda973e6b9c774cd06857609357'
+sha256sums=('dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad'
             'SKIP'
             '56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e'
-            'SKIP'
-            '9e64e6abe9b118ee496c317ef37f4b500b54ecd69e9c02cad2a6a0b7235e9afd')
+            'SKIP')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
@@ -46,10 +44,6 @@ validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag a
 prepare() {
   cd "rustc-$pkgver-src"
 
-  # For https://bugzilla.redhat.com/show_bug.cgi?id=1756487
-  # From https://src.fedoraproject.org/rpms/rust/tree/master
-  patch -Np1 -i ../0001-WIP-minimize-the-rust-std-component.patch
-
   cat >config.toml <<END
 [llvm]
 link-shared = true