[pkgsrc/trunk]: pkgsrc/lang/rust rust: fix build with rust-1.57.0

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1a86d677cdc
branches:  trunk
changeset: 373144:b1a86d677cdc
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Feb 07 09:16:05 2022 +0000

description:
rust: fix build with rust-1.57.0

diffstat:

 lang/rust/distinfo                           |   4 ++--
 lang/rust/patches/patch-src_bootstrap_lib.rs |  23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r af1ae1b98941 -r b1a86d677cdc lang/rust/distinfo
--- a/lang/rust/distinfo        Mon Feb 07 09:01:02 2022 +0000
+++ b/lang/rust/distinfo        Mon Feb 07 09:16:05 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.140 2022/01/21 23:20:36 he Exp $
+$NetBSD: distinfo,v 1.141 2022/02/07 09:16:05 tnn Exp $
 
 BLAKE2s (rust-1.56.0-x86_64-unknown-illumos.tar.gz) = 2cfc266e0ac44f0e0ddca2e3f17a3137cfa6c33cce917eb7bd05f60afb8eef24
 SHA512 (rust-1.56.0-x86_64-unknown-illumos.tar.gz) = 5b74ecb03cec82ee524b83439fd3f029de7bcdcbc3696fd3897441a9c1bc719e0cd19cedb2e35613377cfc09435476ae53d9cdf71734f9437d185acc2dfaa5ad
@@ -114,7 +114,7 @@
 SHA1 (patch-src_bootstrap_bootstrap.py) = 353c3b079756bb4a250cdda5752c60b5a7289ce8
 SHA1 (patch-src_bootstrap_builder.rs) = b686a545c001936f6da22f7a5b38ac1300c9869b
 SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
-SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
+SHA1 (patch-src_bootstrap_lib.rs) = e4b96b0120451cc6a1708fc6d936a5c47c40ee4b
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7666d5d3254506a0a69bc68e99b68a9c61cf357b
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = a59dcdcd34ca24df8b381ae84ff58e2c61a44dd3
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
diff -r af1ae1b98941 -r b1a86d677cdc lang/rust/patches/patch-src_bootstrap_lib.rs
--- a/lang/rust/patches/patch-src_bootstrap_lib.rs      Mon Feb 07 09:01:02 2022 +0000
+++ b/lang/rust/patches/patch-src_bootstrap_lib.rs      Mon Feb 07 09:16:05 2022 +0000
@@ -1,11 +1,28 @@
-$NetBSD: patch-src_bootstrap_lib.rs,v 1.11 2021/11/20 16:09:46 he Exp $
+$NetBSD: patch-src_bootstrap_lib.rs,v 1.12 2022/02/07 09:16:05 tnn Exp $
 
 Don't filter out optimization flags.
 FreeBSD has a particular C++ runtime library name
 
---- src/bootstrap/lib.rs.orig  2021-09-06 18:42:35.000000000 +0000
+With rust-1.57.0 as bootstrap we get this:
+error: field is never read: `id`
+   --> src/bootstrap/lib.rs:280:5
+    |
+280 |     id: String,
+    |     ^^^^^^^^^^
+    |
+    = note: `-D dead-code` implied by `-D warnings`
+
+--- src/bootstrap/lib.rs.orig  2021-11-29 19:27:11.000000000 +0000
 +++ src/bootstrap/lib.rs
-@@ -954,14 +954,13 @@ impl Build {
+@@ -273,6 +273,7 @@ pub struct Build {
+         RefCell<HashMap<TargetSelection, HashMap<String, (&'static str, PathBuf, Vec<String>)>>>,
+ }
+ 
++#[allow(dead_code)]
+ #[derive(Debug)]
+ struct Crate {
+     name: Interned<String>,
+@@ -954,14 +955,13 @@ impl Build {
              .args()
              .iter()
              .map(|s| s.to_string_lossy().into_owned())